Revision: 13628
Author: [email protected]
Date: Fri Feb 8 00:54:29 2013
Log: Fix incorrect merge of r12822 into 3.12 branch.
[email protected]
Review URL: https://chromiumcodereview.appspot.com/12217082
http://code.google.com/p/v8/source/detail?r=13628
Modified:
/branches/3.12/src/hydrogen-instructions.h
/branches/3.12/src/version.cc
=======================================
--- /branches/3.12/src/hydrogen-instructions.h Thu Feb 7 05:48:26 2013
+++ /branches/3.12/src/hydrogen-instructions.h Fri Feb 8 00:54:29 2013
@@ -4623,6 +4623,7 @@
set_representation(Representation::Tagged());
SetFlag(kUseGVN);
SetGVNFlag(kDependsOnMaps);
+ SetGVNFlag(kChangesNewSpacePromotion);
}
virtual Representation RequiredInputRepresentation(int index) {
@@ -4706,7 +4707,6 @@
set_representation(Representation::Tagged());
SetFlag(kUseGVN);
SetGVNFlag(kDependsOnMaps);
- SetGVNFlag(kChangesNewSpacePromotion);
}
virtual Representation RequiredInputRepresentation(int index) {
=======================================
--- /branches/3.12/src/version.cc Thu Feb 7 05:48:26 2013
+++ /branches/3.12/src/version.cc Fri Feb 8 00:54:29 2013
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 12
#define BUILD_NUMBER 19
-#define PATCH_LEVEL 18
+#define PATCH_LEVEL 19
// 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.
