Merge

Author: William Kemper

make/ide/netbeans/langtools/build.xml

@@ -242,7 +242,7 @@
                 </nbjpdastart>
                 <property
                     name="@{jpda.jvmargs.property}"
-                    value="-Xdebug -Xrunjdwp:transport=dt_socket,address=${jpda.address}"
+                    value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"
                 />
             </sequential>
         </macrodef>

src/hotspot/cpu/aarch64/aarch64.ad

@@ -2302,7 +2302,7 @@ bool Matcher::match_rule_supported(int opcode) {
       break;
     case Op_ExpandBits:
     case Op_CompressBits:
-      if (!(UseSVE > 1 && VM_Version::supports_svebitperm())) {
+      if (!VM_Version::supports_svebitperm()) {
         ret_value = false;
       }
       break;