Mercurial > hg > truffle

comparison src/share/vm/runtime/init.cpp @ 1299:9eba43136cb5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob Summary: Passing a null pointer to an InvokeDynamic function call should lead to a NullPointerException. Reviewed-by: kvn, never
author twisti
date Tue, 16 Mar 2010 11:52:17 +0100
parents d95b224e9f17
children c18cbe5936b8
comparison
equal deleted inserted replaced
1298:da06d1795d84 1299:9eba43136cb5
1 /* 1 /*
2 * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved. 2 * Copyright 1997-2010 Sun Microsystems, Inc. All Rights Reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
116 return JNI_ERR; 116 return JNI_ERR;
117 } 117 }
118 javaClasses_init(); // must happen after vtable initialization 118 javaClasses_init(); // must happen after vtable initialization
119 stubRoutines_init2(); // note: StubRoutines need 2-phase init 119 stubRoutines_init2(); // note: StubRoutines need 2-phase init
120 120
121 // Generate MethodHandles adapters.
122 MethodHandles::generate_adapters();
123
121 // Although we'd like to, we can't easily do a heap verify 124 // Although we'd like to, we can't easily do a heap verify
122 // here because the main thread isn't yet a JavaThread, so 125 // here because the main thread isn't yet a JavaThread, so
123 // its TLAB may not be made parseable from the usual interfaces. 126 // its TLAB may not be made parseable from the usual interfaces.
124 if (VerifyBeforeGC && !UseTLAB && 127 if (VerifyBeforeGC && !UseTLAB &&
125 Universe::heap()->total_collections() >= VerifyGCStartAt) { 128 Universe::heap()->total_collections() >= VerifyGCStartAt) {