Reviewers: Yang,
Description:
Merged r12086, r12478 into 3.9 branch.
Fix transcendental cache on ARM in optimized code.
Fix delta computation in DoDeferredInstanceOfKnownGlobal() for ARM.
BUG=v8:2234,v8:2314
[email protected]
Please review this at https://chromiumcodereview.appspot.com/10942027/
SVN Base: https://v8.googlecode.com/svn/branches/3.9
Affected files:
M src/arm/code-stubs-arm.cc
M src/arm/lithium-codegen-arm.cc
M src/version.cc
A + test/mjsunit/regress/regress-2234.js
Index: src/arm/code-stubs-arm.cc
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
index
f772db9be2078f0ecaa24a633e1af438be6dbe9c..8068f9c13e7ed16692e50e74bd595f121e280d02
100644
--- a/src/arm/code-stubs-arm.cc
+++ b/src/arm/code-stubs-arm.cc
@@ -3323,23 +3323,23 @@ void
TranscendentalCacheStub::Generate(MacroAssembler* masm) {
ExternalReference(RuntimeFunction(), masm->isolate());
__ TailCallExternalReference(runtime_function, 1, 1);
} else {
- if (!CpuFeatures::IsSupported(VFP3)) UNREACHABLE();
+ ASSERT(CpuFeatures::IsSupported(VFP3));
CpuFeatures::Scope scope(VFP3);
Label no_update;
Label skip_cache;
// Call C function to calculate the result and update the cache.
- // Register r0 holds precalculated cache entry address; preserve
- // it on the stack and pop it into register cache_entry after the
- // call.
- __ push(cache_entry);
+ // r0: precalculated cache entry address.
+ // r2 and r3: parts of the double value.
+ // Store r0, r2 and r3 on stack for later before calling C function.
+ __ Push(r3, r2, cache_entry);
GenerateCallCFunction(masm, scratch0);
__ GetCFunctionDoubleResult(d2);
// Try to update the cache. If we cannot allocate a
// heap number, we return the result without updating.
- __ pop(cache_entry);
+ __ Pop(r3, r2, cache_entry);
__ LoadRoot(r5, Heap::kHeapNumberMapRootIndex);
__ AllocateHeapNumber(r6, scratch0, scratch1, r5, &no_update);
__ vstr(d2, FieldMemOperand(r6, HeapNumber::kValueOffset));
Index: src/arm/lithium-codegen-arm.cc
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
index
82b80a2b802d685c5c8ba400bf9a1bb58da7b3ba..c9fc0e33508092b2f92d9df053d63fd0d7f8c075
100644
--- a/src/arm/lithium-codegen-arm.cc
+++ b/src/arm/lithium-codegen-arm.cc
@@ -2256,12 +2256,18 @@ void
LCodeGen::DoDeferredInstanceOfKnownGlobal(LInstanceOfKnownGlobal* instr,
Register temp = ToRegister(instr->TempAt(0));
ASSERT(temp.is(r4));
__ LoadHeapObject(InstanceofStub::right(), instr->function());
- static const int kAdditionalDelta = 4;
+ static const int kAdditionalDelta = 5;
int delta = masm_->InstructionsGeneratedSince(map_check) +
kAdditionalDelta;
Label before_push_delta;
__ bind(&before_push_delta);
__ BlockConstPoolFor(kAdditionalDelta);
__ mov(temp, Operand(delta * kPointerSize));
+ // The mov above can generate one or two instructions. The delta was
computed
+ // for two instructions, so we need to pad here in case of one
instruction.
+ if (masm_->InstructionsGeneratedSince(&before_push_delta) != 2) {
+ ASSERT_EQ(1, masm_->InstructionsGeneratedSince(&before_push_delta));
+ __ nop();
+ }
__ StoreToSafepointRegisterSlot(temp, temp);
CallCodeGeneric(stub.GetCode(),
RelocInfo::CODE_TARGET,
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
f502165d0aad7ef5e78c2d245425a356aad452f0..072af766ba707fd394f49d8fad832d23cc0e9c42
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 9
#define BUILD_NUMBER 24
-#define PATCH_LEVEL 33
+#define PATCH_LEVEL 34
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
Index: test/mjsunit/regress/regress-2234.js
diff --git a/test/mjsunit/regress/regress-2045.js
b/test/mjsunit/regress/regress-2234.js
similarity index 83%
copy from test/mjsunit/regress/regress-2045.js
copy to test/mjsunit/regress/regress-2234.js
index
822ee1fa4641b4a0ba15eee2c2a2e59411db7d4d..8da513e30e45352330354d12ab8bcf6e6cf64c02
100644
--- a/test/mjsunit/regress/regress-2045.js
+++ b/test/mjsunit/regress/regress-2234.js
@@ -27,23 +27,15 @@
// Flags: --allow-natives-syntax
-function foo() {
- assertEquals(2, arguments.length);
+function test(i) {
+ // Overwrite random parts of the transcendental cache.
+ Math.sin(i / 1779 * Math.PI);
+ // Check whether the first cache line has been accidentally overwritten
+ // with incorrect key.
+ assertEquals(0, Math.sin(0));
}
-function bar() {
- G.x;
- return foo.apply(this, arguments);
+for (i = 0; i < 10000; ++i) {
+ test(i);
+ if (i == 0) %OptimizeFunctionOnNextCall(test);
}
-
-function baz() {
- return bar(1, 2);
-}
-
-G = {x: 0};
-baz();
-baz();
-%OptimizeFunctionOnNextCall(baz);
-baz();
-delete G.x;
-baz();
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
