Reviewers: ulan,

Description:
Merged r14433 into trunk branch.

Get isolate from thread local instead of (potentially missing) block in
HConstant.

[email protected]
BUG=

Please review this at https://chromiumcodereview.appspot.com/13890014/

SVN Base: https://v8.googlecode.com/svn/trunk

Affected files:
  M src/hydrogen-instructions.h
  M src/version.cc


Index: src/hydrogen-instructions.h
diff --git a/src/hydrogen-instructions.h b/src/hydrogen-instructions.h
index 6ec698179a9b7d7ed797e447297d60d8019084f4..5ac0ff14f070413538c865f82bca443b541c99e9 100644
--- a/src/hydrogen-instructions.h
+++ b/src/hydrogen-instructions.h
@@ -3247,9 +3247,9 @@ class HConstant: public HTemplateInstruction<0> {

   Handle<Object> handle() {
     if (handle_.is_null()) {
-      handle_ = isolate()->factory()->NewNumber(double_value_, TENURED);
+      handle_ = FACTORY->NewNumber(double_value_, TENURED);
     }
-    ALLOW_HANDLE_DEREF(isolate(), "smi check");
+    ALLOW_HANDLE_DEREF(Isolate::Current(), "smi check");
     ASSERT(has_int32_value_ || !handle_->IsSmi());
     return handle_;
   }
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index 1c224b9017e20391c496f5192dac2e07834910cd..2380d90728239d854b0a7294d66038001820a39d 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     18
 #define BUILD_NUMBER      3
-#define PATCH_LEVEL       1
+#define PATCH_LEVEL       2
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to