diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..4a16292 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,16 @@ +name: CI + +on: [push, pull_request] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: 12 + - name: Build with Gradle + run: ./gradlew build diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..87e5f97 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +.DS_Store + +.gradle + +build/ + +.idea/ +out/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..51049df --- /dev/null +++ b/build.gradle @@ -0,0 +1,5 @@ +subprojects { + repositories { + jcenter() + } +} \ No newline at end of file diff --git a/example/build.gradle b/example/build.gradle new file mode 100644 index 0000000..414be07 --- /dev/null +++ b/example/build.gradle @@ -0,0 +1,16 @@ +plugins { + id "java" +} + +sourceCompatibility = targetCompatibility = 12 + +compileJava { + options.compilerArgs = [ + "--enable-preview", + "-Xplugin:jabel" + ] +} + +dependencies { + annotationProcessor project(":jabel-javac-plugin") +} \ No newline at end of file diff --git a/example/src/main/java/com/example/JabelExample.java b/example/src/main/java/com/example/JabelExample.java new file mode 100644 index 0000000..c6780a7 --- /dev/null +++ b/example/src/main/java/com/example/JabelExample.java @@ -0,0 +1,28 @@ +package com.example; + +public class JabelExample { + public static void main(String[] args) { + var result = switch (args.length) { + case 1 -> { + break "one"; + } + case 2, 3 -> "two or three"; + default -> new JabelExample().new Inner().innerPublic(); + }; + + System.out.println(result); + } + + private String outerPrivate() { + // Test indy strings + return "idk " + Integer.toString(0); + } + + class Inner { + + public String innerPublic() { + // Test nest-mate + return outerPrivate(); + } + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..5c2d1cf Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..59b5f89 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..b0d6d0a --- /dev/null +++ b/gradlew @@ -0,0 +1,188 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9991c50 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/jabel-javac-plugin/build.gradle b/jabel-javac-plugin/build.gradle new file mode 100644 index 0000000..9aeb532 --- /dev/null +++ b/jabel-javac-plugin/build.gradle @@ -0,0 +1,10 @@ +plugins { + id "java" +} + +sourceCompatibility = targetCompatibility = 8 + +dependencies { + compile 'net.bytebuddy:byte-buddy:1.10.1' + compile 'net.bytebuddy:byte-buddy-agent:1.10.1' +} \ No newline at end of file diff --git a/jabel-javac-plugin/src/main/java/com/github/bsideup/jabel/JabelJavacPlugin.java b/jabel-javac-plugin/src/main/java/com/github/bsideup/jabel/JabelJavacPlugin.java new file mode 100644 index 0000000..03fc823 --- /dev/null +++ b/jabel-javac-plugin/src/main/java/com/github/bsideup/jabel/JabelJavacPlugin.java @@ -0,0 +1,180 @@ +package com.github.bsideup.jabel; + +import com.sun.source.util.JavacTask; +import com.sun.source.util.Plugin; +import com.sun.tools.javac.api.BasicJavacTask; +import com.sun.tools.javac.jvm.ClassFile; +import com.sun.tools.javac.jvm.ClassWriter; +import com.sun.tools.javac.jvm.Gen; +import com.sun.tools.javac.jvm.StringConcat; +import com.sun.tools.javac.jvm.Target; +import com.sun.tools.javac.util.Context; +import net.bytebuddy.ByteBuddy; +import net.bytebuddy.agent.ByteBuddyAgent; +import net.bytebuddy.asm.AsmVisitorWrapper; +import net.bytebuddy.description.field.FieldDescription; +import net.bytebuddy.description.field.FieldList; +import net.bytebuddy.description.method.MethodList; +import net.bytebuddy.description.type.TypeDescription; +import net.bytebuddy.dynamic.loading.ClassReloadingStrategy; +import net.bytebuddy.implementation.FixedValue; +import net.bytebuddy.implementation.Implementation; +import net.bytebuddy.jar.asm.ClassVisitor; +import net.bytebuddy.jar.asm.MethodVisitor; +import net.bytebuddy.jar.asm.Opcodes; +import net.bytebuddy.pool.TypePool; + +import java.lang.reflect.Field; + +import static net.bytebuddy.jar.asm.Opcodes.ASM7; +import static net.bytebuddy.matcher.ElementMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.none; + +public class JabelJavacPlugin implements Plugin { + + @Override + public String getName() { + return "jabel"; + } + + @Override + public void init(JavacTask task, String... args) { + System.out.println("Jabel: init"); + + ByteBuddyAgent.install(); + + ByteBuddy byteBuddy = new ByteBuddy(); + + byteBuddy + .redefine(Target.class) + .method( + none() + .or(named("hasNestmateAccess")) + .or(named("hasStringConcatFactory")) + .or(named("hasVirtualPrivateInvoke")) + ) + .intercept(FixedValue.value(false)) + .make() + .load(Target.class.getClassLoader(), ClassReloadingStrategy.fromInstalledAgent()); + + byteBuddy + .redefine(ClassWriter.class) + .visit(new AsmVisitorWrapper() { + @Override + public int mergeWriter(int flags) { + return flags; + } + + @Override + public int mergeReader(int flags) { + return flags; + } + + @Override + public ClassVisitor wrap( + TypeDescription instrumentedType, + ClassVisitor classVisitor, + Implementation.Context implementationContext, + TypePool typePool, + FieldList fields, + MethodList methods, + int writerFlags, + int readerFlags + ) { + return new ClassWriterClassVisitor(classVisitor); + } + }) + .make() + .load(ClassFile.class.getClassLoader(), ClassReloadingStrategy.fromInstalledAgent()); + + Context context = ((BasicJavacTask) task).getContext(); + + Target target = Target.instance(context); + + if (target.compareTo(Target.JDK1_8) > 0) { + if (target.hasNestmateAccess()) { + throw new IllegalStateException("Nestmate instrumentation failed!"); + } + if (target.hasStringConcatFactory()) { + throw new IllegalStateException("StringConcat instrumentation failed!"); + } + if (target.hasVirtualPrivateInvoke()) { + throw new IllegalStateException("Virtual private invoke instrumentation failed!"); + } + } + + try { + { + Field field = Target.class.getDeclaredField("majorVersion"); + field.setAccessible(true); + field.set(target, Target.JDK1_8.majorVersion); + } + + { + Field field = Target.class.getDeclaredField("minorVersion"); + field.setAccessible(true); + field.set(target, Target.JDK1_8.minorVersion); + } + + { + Field field = StringConcat.class.getDeclaredField("concatKey"); + field.setAccessible(true); + + Object key = field.get(null); + // reset StringConcat + context.put((Context.Key) key, (Object) null); + } + + { + Field field = Gen.class.getDeclaredField("concat"); + field.setAccessible(true); + + field.set(Gen.instance(context), StringConcat.instance(context)); + } + } catch (Throwable e) { + throw new RuntimeException(e); + } + } + + private static class ClassWriterClassVisitor extends ClassVisitor { + + // Create boxed constants + static final Integer PREVIEW_MINOR_VERSION = ClassFile.PREVIEW_MINOR_VERSION; + + static final Integer JAVA_MAGIC = ClassFile.JAVA_MAGIC; + + ClassWriterClassVisitor(ClassVisitor classVisitor) { + super(Opcodes.ASM7, classVisitor); + } + + @Override + public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) { + MethodVisitor methodVisitor = super.visitMethod(access, name, descriptor, signature, exceptions); + if ("writeClassFile".equals(name)) { + return new MethodVisitor(ASM7, methodVisitor) { + + int stage = 0; + + @Override + public void visitLdcInsn(Object value) { + switch (stage) { + case 0: + if (JAVA_MAGIC.equals(value)) { + stage = 1; + } + break; + case 1: + if (PREVIEW_MINOR_VERSION.equals(value)) { + stage = 2; + value = Target.JDK1_8.minorVersion; + } + } + + super.visitLdcInsn(value); + } + }; + } + return methodVisitor; + } + } +} diff --git a/jabel-javac-plugin/src/main/resources/META-INF/services/com.sun.source.util.Plugin b/jabel-javac-plugin/src/main/resources/META-INF/services/com.sun.source.util.Plugin new file mode 100644 index 0000000..141b01e --- /dev/null +++ b/jabel-javac-plugin/src/main/resources/META-INF/services/com.sun.source.util.Plugin @@ -0,0 +1 @@ +com.github.bsideup.jabel.JabelJavacPlugin \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..26b60bd --- /dev/null +++ b/settings.gradle @@ -0,0 +1,4 @@ +rootProject.name = 'jabel' + +include 'jabel-javac-plugin' +include 'example' \ No newline at end of file