Revision: 20342
Author:   [email protected]
Date:     Mon Mar 31 11:02:42 2014 UTC
Log:      Merged r20262 into 3.24 branch.

Always initialize elements pointer in fast literals.

[email protected]
BUG=355586

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

Modified:
 /branches/3.24/src/hydrogen.cc
 /branches/3.24/src/version.cc

=======================================
--- /branches/3.24/src/hydrogen.cc      Tue Mar  4 13:14:47 2014 UTC
+++ /branches/3.24/src/hydrogen.cc      Mon Mar 31 11:02:42 2014 UTC
@@ -9764,6 +9764,15 @@
   HInstruction* object = Add<HAllocate>(object_size_constant, type,
       pretenure_flag, instance_type, site_context->current());

+  // If allocation folding reaches Page::kMaxRegularHeapObjectSize the
+  // elements array may not get folded into the object. Hence, we set the
+  // elements pointer to empty fixed array and let store elimination remove
+  // this store in the folding case.
+  HConstant* empty_fixed_array = Add<HConstant>(
+      isolate()->factory()->empty_fixed_array());
+  Add<HStoreNamedField>(object, HObjectAccess::ForElementsPointer(),
+      empty_fixed_array, INITIALIZING_STORE);
+
   BuildEmitObjectHeader(boilerplate_object, object);

   Handle<FixedArrayBase> elements(boilerplate_object->elements());
=======================================
--- /branches/3.24/src/version.cc       Wed Mar 26 10:32:37 2014 UTC
+++ /branches/3.24/src/version.cc       Mon Mar 31 11:02:42 2014 UTC
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     24
 #define BUILD_NUMBER      35
-#define PATCH_LEVEL       20
+#define PATCH_LEVEL       21
 // 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/d/optout.

Reply via email to