Index: runtime/vm/simulator_arm.cc |
diff --git a/runtime/vm/simulator_arm.cc b/runtime/vm/simulator_arm.cc |
index 1fcb66bc922e02de7a7f93e67907c54bcfd45693..f11bab757161a53db18f63a373a7e44959d6a546 100644 |
--- a/runtime/vm/simulator_arm.cc |
+++ b/runtime/vm/simulator_arm.cc |
@@ -44,7 +44,6 @@ DEFINE_FLAG(uint64_t, stop_sim_at, ULLONG_MAX, |
// The runtime then does a Longjmp on that buffer to return to the simulator. |
class SimulatorSetjmpBuffer { |
public: |
- int Setjmp() { return setjmp(buffer_); } |
void Longjmp() { |
// "This" is now the last setjmp buffer. |
simulator_->set_last_setjmp_buffer(this); |
@@ -1546,7 +1545,7 @@ void Simulator::SupervisorCall(Instr* instr) { |
ASSERT(sizeof(NativeArguments) == 4*kWordSize); |
arguments.thread_ = reinterpret_cast<Thread*>(get_register(R0)); |
arguments.argc_tag_ = get_register(R1); |
- arguments.argv_ = reinterpret_cast<RawObject*(*)[]>(get_register(R2)); |
+ arguments.argv_ = reinterpret_cast<RawObject**>(get_register(R2)); |
arguments.retval_ = reinterpret_cast<RawObject**>(get_register(R3)); |
SimulatorRuntimeCall target = |
reinterpret_cast<SimulatorRuntimeCall>(external); |