Reviewers: danno, Jakob, Paul Lind, kisg, Yury Semikhatsky, palfia,

Description:
MIPS: Fix test-cpu-profiler/SampleWhenFrameIsNotSetup flakiness on MIPS
simulator.

BUG=v8:2628

TEST=cctest/test-cpu-profiler/SampleWhenFrameIsNotSetup

Please review this at https://codereview.chromium.org/17265004/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files:
  M src/mips/simulator-mips.h
  M test/cctest/cctest.status


Index: src/mips/simulator-mips.h
diff --git a/src/mips/simulator-mips.h b/src/mips/simulator-mips.h
index a091e5fb20614e171f6cabf6e49375b3f8cd6be7..601cd6d99d113c867419fac06ffdcbc3de5f938c 100644
--- a/src/mips/simulator-mips.h
+++ b/src/mips/simulator-mips.h
@@ -316,8 +316,6 @@ class Simulator {
     if (instr->InstructionBits() == nopInstr) {
       // Short-cut generic nop instructions. They are always valid and they
       // never change the simulator state.
-      set_register(pc, reinterpret_cast<int32_t>(instr) +
-                       Instruction::kInstrSize);
       return;
     }

Index: test/cctest/cctest.status
diff --git a/test/cctest/cctest.status b/test/cctest/cctest.status
index 59b3dc35114e55da9eed44d78583d267b256bafd..f3a181a9ed830742e794126989a26716e04300d8 100644
--- a/test/cctest/cctest.status
+++ b/test/cctest/cctest.status
@@ -75,9 +75,6 @@ test-serialize/DeserializeFromSecondSerialization: SKIP
##############################################################################
 [ $arch == mipsel ]

-# BUG(2628): The test sometimes fails on MIPS simulator.
-test-cpu-profiler/SampleWhenFrameIsNotSetup: PASS || FAIL
-
 # BUG(2657): Test sometimes times out on MIPS simulator.
test-thread-termination/TerminateMultipleV8ThreadsDefaultIsolate: PASS || TIMEOUT



--
--
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.


Reply via email to