Version 1.10.0-dev.1.6
svn merge -c 45121 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
svn merge -c 45222 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
git-svn-id: http://dart.googlecode.com/svn/trunk@45225 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
index abc5343..645e8d4 100644
--- a/runtime/vm/isolate.cc
+++ b/runtime/vm/isolate.cc
@@ -595,6 +595,7 @@
default_tag_(UserTag::null()),
deoptimized_code_array_(GrowableObjectArray::null()),
metrics_list_head_(NULL),
+ cha_(NULL),
next_(NULL),
REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_INITIALIZERS)
REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_SCOPE_INIT)
@@ -658,6 +659,7 @@
current_tag_(UserTag::null()),
default_tag_(UserTag::null()),
metrics_list_head_(NULL),
+ cha_(NULL),
next_(NULL),
REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_INITIALIZERS)
REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_SCOPE_INIT)
diff --git a/runtime/vm/isolate.h b/runtime/vm/isolate.h
index beafd96..efb3486 100644
--- a/runtime/vm/isolate.h
+++ b/runtime/vm/isolate.h
@@ -768,6 +768,9 @@
Counters counters_;
+ // TODO(23153): Move this out of Isolate/Thread.
+ CHA* cha_;
+
// Isolate list next pointer.
Isolate* next_;
diff --git a/runtime/vm/thread.cc b/runtime/vm/thread.cc
index c319b51..2140078 100644
--- a/runtime/vm/thread.cc
+++ b/runtime/vm/thread.cc
@@ -87,4 +87,15 @@
}
+CHA* Thread::cha() const {
+ ASSERT(isolate_ != NULL);
+ return isolate_->cha_;
+}
+
+
+void Thread::set_cha(CHA* value) {
+ ASSERT(isolate_ != NULL);
+ isolate_->cha_ = value;
+}
+
} // namespace dart
diff --git a/runtime/vm/thread.h b/runtime/vm/thread.h
index 8218fba..f03adcf 100644
--- a/runtime/vm/thread.h
+++ b/runtime/vm/thread.h
@@ -46,19 +46,18 @@
// The isolate that this thread is operating on, or NULL if none.
Isolate* isolate() const { return isolate_; }
- // The (topmost) CHA for the compilation in this thread.
- CHA* cha() const { return cha_; }
- void set_cha(CHA* value) { cha_ = value; }
+ // The (topmost) CHA for the compilation in the isolate of this thread.
+ // TODO(23153): Move this out of Isolate/Thread.
+ CHA* cha() const;
+ void set_cha(CHA* value);
private:
static ThreadLocalKey thread_key_;
Isolate* isolate_;
- CHA* cha_;
Thread()
- : isolate_(NULL),
- cha_(NULL) {}
+ : isolate_(NULL) {}
static void SetCurrent(Thread* current);
diff --git a/sdk/lib/_internal/compiler/js_lib/js_helper.dart b/sdk/lib/_internal/compiler/js_lib/js_helper.dart
index 2248dc6..da78c86 100644
--- a/sdk/lib/_internal/compiler/js_lib/js_helper.dart
+++ b/sdk/lib/_internal/compiler/js_lib/js_helper.dart
@@ -3546,7 +3546,7 @@
int index = uri.lastIndexOf('/');
uri = '${uri.substring(0, index + 1)}$hunkName';
- var xhr = JS('dynamic', 'new XMLHttpRequest()');
+ var xhr = JS('var', 'new XMLHttpRequest()');
JS('void', '#.open("GET", #)', xhr, uri);
JS('void', '#.addEventListener("load", #, false)',
xhr, convertDartClosureToJS((event) {
diff --git a/tools/VERSION b/tools/VERSION
index f5b7a3b..30df61a 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
MINOR 10
PATCH 0
PRERELEASE 1
-PRERELEASE_PATCH 5
+PRERELEASE_PATCH 6
