From d062cca8246d7943d2fc3c7a47f0f770bb48169d Mon Sep 17 00:00:00 2001
From: vromero <unknown>
Date: Sat, 10 Aug 2013 13:27:38 +0100
Subject: [PATCH] 8009640: -profile <compact> does not work when -bootclasspath
 specified Reviewed-by: jjg

---
 .../com/sun/tools/javac/main/Main.java        |  5 ++
 .../tools/javac/resources/javac.properties    |  2 +
 ...ctProfileBCPOptionsIfUsedTogetherTest.java | 66 +++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 test/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java

diff --git a/src/share/classes/com/sun/tools/javac/main/Main.java b/src/share/classes/com/sun/tools/javac/main/Main.java
index 72a279d7..2842487b 100644
--- a/src/share/classes/com/sun/tools/javac/main/Main.java
+++ b/src/share/classes/com/sun/tools/javac/main/Main.java
@@ -262,6 +262,11 @@ public class Main {
             }
         }
 
+        if (options.get(PROFILE) != null && options.get(BOOTCLASSPATH) != null) {
+            error("err.profile.bootclasspath.conflict");
+            return null;
+        }
+
         if (this.classnames != null && classNames != null) {
             this.classnames.addAll(Arrays.asList(classNames));
         }
diff --git a/src/share/classes/com/sun/tools/javac/resources/javac.properties b/src/share/classes/com/sun/tools/javac/resources/javac.properties
index f32c2291..328d9fbf 100644
--- a/src/share/classes/com/sun/tools/javac/resources/javac.properties
+++ b/src/share/classes/com/sun/tools/javac/resources/javac.properties
@@ -185,6 +185,8 @@ javac.err.invalid.A.key=\
      key in annotation processor option ''{0}'' is not a dot-separated sequence of identifiers
 javac.err.invalid.flag=\
     invalid flag: {0}
+javac.err.profile.bootclasspath.conflict=\
+    profile and bootclasspath options cannot be used together
 javac.err.invalid.profile=\
     invalid profile: {0}
 javac.err.invalid.target=\
diff --git a/test/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java b/test/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java
new file mode 100644
index 00000000..186774a6
--- /dev/null
+++ b/test/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2013, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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 8009640
+ * @summary -profile <compact> does not work when -bootclasspath specified
+ * @library /tools/javac/lib
+ * @build ToolBox
+ * @run main CheckRejectProfileBCPOptionsIfUsedTogetherTest
+ */
+
+import com.sun.tools.javac.util.Assert;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CheckRejectProfileBCPOptionsIfUsedTogetherTest {
+
+    private static final String TestSrc =
+        "public class Test {\n" +
+        "    javax.swing.JButton b;\n" +
+        "}";
+
+    public static void main(String args[]) throws Exception {
+        List<String> errOutput = new ArrayList<>();
+        String testJDK = ToolBox.jdkUnderTest;
+        ToolBox.createJavaFileFromSource(TestSrc);
+
+        ToolBox.AnyToolArgs javacParams =
+                new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
+                .appendArgs(ToolBox.javacBinary)
+                .appendArgs(ToolBox.testToolVMOpts)
+                .appendArgs("-profile", "compact1", "-bootclasspath",
+                testJDK + "/jre/lib/rt.jar", "Test.java")
+                .setErrOutput(errOutput);
+
+        ToolBox.executeCommand(javacParams);
+
+        Assert.check(errOutput.get(0).startsWith(
+                "javac: profile and bootclasspath options cannot be used together"),
+                "Incorrect javac error output");
+    }
+
+}
-- 
GitLab