1.1 --- a/rt/emul/compact/src/main/java/java/lang/invoke/LambdaForm.java Sat Aug 09 11:11:13 2014 +0200
1.2 +++ b/rt/emul/compact/src/main/java/java/lang/invoke/LambdaForm.java Sun Aug 10 07:02:12 2014 +0200
1.3 @@ -450,15 +450,16 @@
1.4 if (vmentry != null && isCompiled) {
1.5 return vmentry; // already compiled somehow
1.6 }
1.7 - try {
1.8 - vmentry = InvokerBytecodeGenerator.generateCustomizedCode(this, invokerType);
1.9 - if (TRACE_INTERPRETER)
1.10 - traceInterpreter("compileToBytecode", this);
1.11 - isCompiled = true;
1.12 - return vmentry;
1.13 - } catch (Error | Exception ex) {
1.14 - throw newInternalError("compileToBytecode", ex);
1.15 - }
1.16 + throw newInternalError("compileToBytecode", new Exception());
1.17 +// try {
1.18 +// vmentry = InvokerBytecodeGenerator.generateCustomizedCode(this, invokerType);
1.19 +// if (TRACE_INTERPRETER)
1.20 +// traceInterpreter("compileToBytecode", this);
1.21 +// isCompiled = true;
1.22 +// return vmentry;
1.23 +// } catch (Error | Exception ex) {
1.24 +// throw newInternalError("compileToBytecode", ex);
1.25 +// }
1.26 }
1.27
1.28 private static final ConcurrentHashMap<String,LambdaForm> PREPARED_FORMS;
1.29 @@ -527,7 +528,9 @@
1.30 if (prep != null) return prep;
1.31 assert(isValidSignature(sig));
1.32 prep = new LambdaForm(sig);
1.33 - prep.vmentry = InvokerBytecodeGenerator.generateLambdaFormInterpreterEntryPoint(sig);
1.34 +// prep.vmentry = InvokerBytecodeGenerator.generateLambdaFormInterpreterEntryPoint(sig);
1.35 + if (true) throw new IllegalStateException();
1.36 +
1.37 //LambdaForm prep2 = PREPARED_FORMS.putIfAbsent(sig.intern(), prep);
1.38 return mtype.form().setCachedLambdaForm(MethodTypeForm.LF_INTERPRET, prep);
1.39 }
1.40 @@ -1129,8 +1132,9 @@
1.41 private static MethodHandle computeInvoker(MethodTypeForm typeForm) {
1.42 MethodHandle mh = typeForm.namedFunctionInvoker;
1.43 if (mh != null) return mh;
1.44 - MemberName invoker = InvokerBytecodeGenerator.generateNamedFunctionInvoker(typeForm); // this could take a while
1.45 - mh = DirectMethodHandle.make(invoker);
1.46 +// MemberName invoker = InvokerBytecodeGenerator.generateNamedFunctionInvoker(typeForm); // this could take a while
1.47 + if (true) throw new IllegalStateException();
1.48 +// mh = DirectMethodHandle.make(invoker);
1.49 MethodHandle mh2 = typeForm.namedFunctionInvoker;
1.50 if (mh2 != null) return mh2; // benign race
1.51 if (!mh.type().equals(INVOKER_METHOD_TYPE))