[vmkit-commits] [vmkit] r200660 - Native printStackTrace (if a problem occurs during bootstrap) also takes into account inlining.

[Gael Thomas]

Author: gthomas
Date: Sun Feb  2 16:36:22 2014
New Revision: 200660

URL: http://llvm.org/viewvc/llvm-project?rev=200660&view=rev
Log:
Native printStackTrace (if a problem occurs during bootstrap) also takes into account inlining.

Modified:
    vmkit/branches/mcjit/lib/j3/vm/j3.cc

Modified: vmkit/branches/mcjit/lib/j3/vm/j3.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3.cc?rev=200660&r1=200659&r2=200660&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3.cc Sun Feb  2 16:36:22 2014
@@ -438,9 +438,11 @@ void J3::printStackTrace() {
 		vmkit::Safepoint* sf = J3Thread::get()->vm()->getSafepoint(walker.ip());
 
 		if(sf) {
-			J3Method* m = (J3Method*)sf->unit()->getSymbol(sf->functionName());
-			fprintf(stderr, "    in %s::%s%s index %d\n", m->cl()->name()->cStr(), m->name()->cStr(),
-							m->signature()->name()->cStr(), sf->sourceIndex());
+			for(uint32_t i=0; i<sf->inlineDepth(); i++) {
+				J3Method* m = (J3Method*)sf->unit()->getSymbol(sf->functionName(i));
+				fprintf(stderr, "    in %s::%s%s index %d\n", m->cl()->name()->cStr(), m->name()->cStr(),
+								m->signature()->name()->cStr(), sf->sourceIndex());
+			}
 		} else {
 			Dl_info info;