Revision: 17195
Author:   rossb...@chromium.org
Date:     Mon Oct 14 13:25:36 2013 UTC
Log:      Fix initial comparison combined_type

R=jkumme...@chromium.org
BUG=

Review URL: https://codereview.chromium.org/27183002
http://code.google.com/p/v8/source/detail?r=17195

Modified:
 /branches/bleeding_edge/src/ast.cc
 /branches/bleeding_edge/src/ast.h
 /branches/bleeding_edge/src/bootstrapper.cc

=======================================
--- /branches/bleeding_edge/src/ast.cc  Mon Oct 14 11:06:15 2013 UTC
+++ /branches/bleeding_edge/src/ast.cc  Mon Oct 14 13:25:36 2013 UTC
@@ -441,8 +441,7 @@
   } else if (oracle->LoadIsBuiltin(this, Builtins::kKeyedLoadIC_String)) {
     is_string_access_ = true;
   } else if (is_monomorphic_) {
-    receiver_types_.Add(oracle->LoadMonomorphicReceiverType(this),
-                        zone);
+    receiver_types_.Add(oracle->LoadMonomorphicReceiverType(this), zone);
   } else if (oracle->LoadIsPolymorphic(this)) {
     receiver_types_.Reserve(kMaxKeyedPolymorphism, zone);
oracle->CollectKeyedReceiverTypes(PropertyFeedbackId(), &receiver_types_);
=======================================
--- /branches/bleeding_edge/src/ast.h   Mon Oct 14 11:06:15 2013 UTC
+++ /branches/bleeding_edge/src/ast.h   Mon Oct 14 13:25:36 2013 UTC
@@ -2029,7 +2029,7 @@
         op_(op),
         left_(left),
         right_(right),
-        combined_type_(Type::Null(), isolate) {
+        combined_type_(Type::None(), isolate) {
     ASSERT(Token::IsCompareOp(op));
   }

=======================================
--- /branches/bleeding_edge/src/bootstrapper.cc Wed Sep 25 15:11:48 2013 UTC
+++ /branches/bleeding_edge/src/bootstrapper.cc Mon Oct 14 13:25:36 2013 UTC
@@ -824,7 +824,7 @@
 // work in the snapshot case is done in HookUpInnerGlobal.
 void Genesis::InitializeGlobal(Handle<GlobalObject> inner_global,
                                Handle<JSFunction> empty_function) {
-  // --- G l o b a l   C o n t e x t ---
+  // --- N a t i v e   C o n t e x t ---
   // Use the empty function as closure (no scope info).
   native_context()->set_closure(*empty_function);
   native_context()->set_previous(NULL);

--
--
v8-dev mailing list
v8-dev@googlegroups.com
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 v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to