Reviewers: Jakob,
Message:
Please take a look.
Description:
Fix incorrect merge of r12822 into 3.12 branch.
[email protected]
Please review this at https://chromiumcodereview.appspot.com/12217082/
SVN Base: https://v8.googlecode.com/svn/branches/3.12
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
621efa9535d57bb90eb6f55497d96171866b14b9..3420061acd851de3f81e39ed66f9c52753aba37b
100644
--- a/src/hydrogen-instructions.h
+++ b/src/hydrogen-instructions.h
@@ -4623,6 +4623,7 @@ class HStringAdd: public HBinaryOperation {
set_representation(Representation::Tagged());
SetFlag(kUseGVN);
SetGVNFlag(kDependsOnMaps);
+ SetGVNFlag(kChangesNewSpacePromotion);
}
virtual Representation RequiredInputRepresentation(int index) {
@@ -4706,7 +4707,6 @@ class HStringLength: public HUnaryOperation {
set_representation(Representation::Tagged());
SetFlag(kUseGVN);
SetGVNFlag(kDependsOnMaps);
- SetGVNFlag(kChangesNewSpacePromotion);
}
virtual Representation RequiredInputRepresentation(int index) {
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
6befd6091c504d3952c8a02ffb436237e0db9415..64f704adbde6617b264207f265b4b17b4f13a460
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -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.
