test/hotspot/jtreg/compiler/unsafe/generate-unsafe-access-tests.sh

rev 53745 : 8218471: generate-unsafe-access-tests.sh does not correctly invoke build.tools.spp.Spp
Reviewed-by: duke

@@ -1,9 +1,9 @@
 #!/bin/bash
 
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019, 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.

@@ -21,11 +21,11 @@
 # 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.
 #
 
-javac -d . ../../../../jdk/make/src/classes/build/tools/spp/Spp.java
+javac -d . ../../../../../make/jdk/src/classes/build/tools/spp/Spp.java
 
 SPP=build.tools.spp.Spp
 
 # Generates unsafe access tests for objects and all primitive types
 # $1 = package name to Unsafe, sun.misc | jdk.internal.misc

@@ -39,10 +39,16 @@
     for type in boolean byte short char int long float double Object
     do
       Type="$(tr '[:lower:]' '[:upper:]' <<< ${type:0:1})${type:1}"
       args="-K$type -Dtype=$type -DType=$Type"
 
+      if [ "$Type" == "Object" -a "$package" == "jdk.internal.misc" ]; then
+        args="$args -DMethodAffix=Reference"
+      else
+        args="$args -DMethodAffix=$Type"
+      fi
+
       case $type in
         Object|int|long)
           args="$args -KCAS -KOrdered"
           ;;
       esac

@@ -121,12 +127,14 @@
       esac
 
       args="$args -Dvalue1=$value1 -Dvalue2=$value2 -Dvalue3=$value3"
 
       echo $args
+      out=${Qualifier}UnsafeAccessTest${Type}.java
+      rm -rf "$out"
       java $SPP -nel -K$Qualifier -Dpackage=$package -DQualifier=$Qualifier -Dmodule=$module \
-          $args < X-UnsafeAccessTest.java.template > ${Qualifier}UnsafeAccessTest${Type}.java
+          $args -iX-UnsafeAccessTest.java.template -o$out
     done
 }
 
 generate sun.misc SunMisc jdk.unsupported
 generate jdk.internal.misc JdkInternalMisc java.base