Reviewers: Toon Verwaest,
Description:
Merged r16566 into trunk branch.
Fix polymorphic INTERCEPTOR StoreICs on ARM/MIPS
BUG=chromium:284998
[email protected]
Please review this at https://codereview.chromium.org/23818004/
SVN Base: https://v8.googlecode.com/svn/trunk
Affected files (+3, -3 lines):
M src/arm/stub-cache-arm.cc
M src/mips/stub-cache-mips.cc
M src/version.cc
Index: src/arm/stub-cache-arm.cc
diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc
index
6ee41105fb6d4fd73a4d031a7d24be4b07a444cf..cb02931bb2b2a675d8a36e9e08c27acf9681b69f
100644
--- a/src/arm/stub-cache-arm.cc
+++ b/src/arm/stub-cache-arm.cc
@@ -2872,7 +2872,7 @@ Handle<Code>
StoreStubCompiler::CompileStoreInterceptor(
TailCallBuiltin(masm(), MissBuiltin(kind()));
// Return the generated code.
- return GetICCode(kind(), Code::INTERCEPTOR, name);
+ return GetCode(kind(), Code::INTERCEPTOR, name);
}
Index: src/mips/stub-cache-mips.cc
diff --git a/src/mips/stub-cache-mips.cc b/src/mips/stub-cache-mips.cc
index
9a6378ba85575955494015209eeeb28190f2fc3d..4342a06d5bd4ed8c78bed534237ceb4ef66d5ae3
100644
--- a/src/mips/stub-cache-mips.cc
+++ b/src/mips/stub-cache-mips.cc
@@ -2894,7 +2894,7 @@ Handle<Code>
StoreStubCompiler::CompileStoreInterceptor(
TailCallBuiltin(masm(), MissBuiltin(kind()));
// Return the generated code.
- return GetICCode(kind(), Code::INTERCEPTOR, name);
+ return GetCode(kind(), Code::INTERCEPTOR, name);
}
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
18436f398b954b8ac033969c1122ecda16ca9f9c..ec288965a1aa4bb8377acfa7c79b8ac53e3fadc7
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 21
#define BUILD_NUMBER 11
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
// 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.
