From e165d5f3fd7ddad312faa397f34d58056417d23d Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Tue, 19 May 2009 18:28:43 -0600 Subject: [PATCH] avoid uninitialized variable warnings in MyProcessor::callWithCurrentContinuation --- src/compile.cpp | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/compile.cpp b/src/compile.cpp index 424b5fdd9e..3dfa33f232 100644 --- a/src/compile.cpp +++ b/src/compile.cpp @@ -5968,12 +5968,6 @@ class MyProcessor: public Processor { virtual void callWithCurrentContinuation(Thread* vmt, object receiver) { MyThread* t = static_cast(vmt); - object method; - object continuation; - void* base; - void* stack; - unsigned oldArgumentFootprint; - { PROTECT(t, receiver); if (receiveMethod == 0) { @@ -6000,26 +5994,27 @@ class MyProcessor: public Processor { } if (LIKELY(t->exception == 0)) { - method = findInterfaceMethod + object method = findInterfaceMethod (t, receiveMethod, objectClass(t, receiver)); PROTECT(t, method); compile(t, ::codeAllocator(t), 0, method); if (LIKELY(t->exception == 0)) { void* ip; - continuation = makeCurrentContinuation + void* base; + void* stack; + unsigned oldArgumentFootprint; + t->continuation = makeCurrentContinuation (t, &ip, &base, &stack, &oldArgumentFootprint); + + callWithContinuation + (t, method, receiver, t->continuation, base, stack, + oldArgumentFootprint); } } } - if (LIKELY(t->exception == 0)) { - t->continuation = continuation; - callWithContinuation(t, method, receiver, continuation, base, stack, - oldArgumentFootprint); - } else { - unwind(t); - } + unwind(t); } virtual void feedResultToContinuation(Thread* vmt, object continuation,