harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r478351 - /harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp
Date Wed, 22 Nov 2006 22:37:37 GMT
Author: gshimansky
Date: Wed Nov 22 14:37:37 2006
New Revision: 478351

URL: http://svn.apache.org/viewvc?view=rev&rev=478351
Log:
Applied HARMONY-2206 [drlvm][interpreter] Assertion "frame.locals.ref(varNum) == FLAG_RET_ADDR"
in interpreter.cpp line 2194

Tests passed on gentoo and windows xp


Modified:
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp?view=diff&rev=478351&r1=478350&r2=478351
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp Wed Nov 22 14:37:37 2006
@@ -2182,7 +2182,7 @@
     uint32 retAddr = frame.ip + 5 - (uint8*)frame.method->get_byte_code_addr();
     frame.stack.push();
     frame.stack.pick().u = retAddr;
-    frame.stack.ref() = FLAG_OBJECT;
+    frame.stack.ref() = FLAG_RET_ADDR;
     DEBUG_BYTECODE("going to instruction");
     frame.ip += read_int32(frame.ip + 1);
 }



Mime
View raw message