Mercurial > hg > truffle
diff src/cpu/x86/vm/c1_LIRGenerator_x86.cpp @ 933:cdb8b7c37ac1
6875329: fix for 6795465 broke exception handler cloning
Reviewed-by: kvn
author | never |
---|---|
date | Mon, 24 Aug 2009 22:26:15 -0700 |
parents | 98cb887364d3 |
children | 89e0543e1737 ff1a29907b6c |
line wrap: on
line diff
--- a/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp Mon Aug 24 11:13:46 2009 -0700 +++ b/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp Mon Aug 24 22:26:15 2009 -0700 @@ -1047,16 +1047,17 @@ items->at_put(i, size); } - // need to get the info before, as the items may become invalid through item_free + // Evaluate state_for early since it may emit code. CodeEmitInfo* patching_info = NULL; if (!x->klass()->is_loaded() || PatchALot) { patching_info = state_for(x, x->state_before()); // cannot re-use same xhandlers for multiple CodeEmitInfos, so - // clone all handlers. + // clone all handlers. This is handled transparently in other + // places by the CodeEmitInfo cloning logic but is handled + // specially here because a stub isn't being used. x->set_exception_handlers(new XHandlers(x->exception_handlers())); } - CodeEmitInfo* info = state_for(x, x->state()); i = dims->length();