From 117f24500e5baa6c79b8dd7e30f5ea0cebbd8f01 Mon Sep 17 00:00:00 2001
From: never <unknown>
Date: Thu, 25 Aug 2011 20:29:30 -0700
Subject: [PATCH] 7082949: JSR 292: missing ResourceMark in
 methodOopDesc::make_invoke_method Reviewed-by: kvn, twisti

---
 src/share/vm/oops/methodOop.cpp        |  1 +
 test/compiler/7082949/Test7082949.java | 54 ++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 test/compiler/7082949/Test7082949.java

diff --git a/src/share/vm/oops/methodOop.cpp b/src/share/vm/oops/methodOop.cpp
index 6575679ea..0f03ae43c 100644
--- a/src/share/vm/oops/methodOop.cpp
+++ b/src/share/vm/oops/methodOop.cpp
@@ -914,6 +914,7 @@ methodHandle methodOopDesc::make_invoke_method(KlassHandle holder,
                                                Symbol* name,
                                                Symbol* signature,
                                                Handle method_type, TRAPS) {
+  ResourceMark rm;
   methodHandle empty;
 
   assert(holder() == SystemDictionary::MethodHandle_klass(),
diff --git a/test/compiler/7082949/Test7082949.java b/test/compiler/7082949/Test7082949.java
new file mode 100644
index 000000000..41b79114f
--- /dev/null
+++ b/test/compiler/7082949/Test7082949.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 7082949
+ * @summary JSR 292: missing ResourceMark in methodOopDesc::make_invoke_method
+ *
+ * @run main Test7082949
+ */
+
+import java.lang.invoke.*;
+import static java.lang.invoke.MethodHandles.*;
+import static java.lang.invoke.MethodType.*;
+
+public class Test7082949 implements Runnable {
+    public static void main(String... args) throws Throwable {
+        new Thread(new Test7082949()).start();
+    }
+
+    public static Test7082949 test() {
+        return null;
+    }
+
+    public void run() {
+        try {
+            MethodHandle m1 = MethodHandles.lookup().findStatic(Test7082949.class, "test",  methodType(Test7082949.class));
+            Test7082949 v = (Test7082949)m1.invokeExact();
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+    }
+}
-- 
GitLab