Merge remote-tracking branch 'origin/targetBytecode' into targetBytecode

# Conflicts:
#	src/test/resources/bytecode/javFiles/Tph7.jav
This commit is contained in:
Victorious3 2022-08-05 16:21:10 +02:00
commit 4e15bd4ae2
4 changed files with 8 additions and 5 deletions

View File

@ -122,8 +122,8 @@ http://maven.apache.org/maven-v4_0_0.xsd">
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>17</source> <source>18</source>
<target>17</target> <target>18</target>
<compilerArgs>--enable-preview</compilerArgs> <compilerArgs>--enable-preview</compilerArgs>
</configuration> </configuration>
</plugin> </plugin>

View File

@ -18,6 +18,9 @@ public class TphTest {
var classFiles = TestCodegen.generateClassFiles("Tph.jav", new ByteArrayClassLoader()); var classFiles = TestCodegen.generateClassFiles("Tph.jav", new ByteArrayClassLoader());
classToTest = classFiles.get("Tph"); classToTest = classFiles.get("Tph");
instanceOfClass = classToTest.getDeclaredConstructor().newInstance(); instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
classFiles = TestCodegen.generateClassFiles("Tph7.jav", new ByteArrayClassLoader());
classToTest = classFiles.get("Tph7");
instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
} }
@Test @Test

View File

@ -3,7 +3,6 @@ public class Tph {
m(a,b){ m(a,b){
var c = m2(b); var c = m2(b);
return a; return a;
// return m2(b);
} }
m2(b){ m2(b){

View File

@ -1,10 +1,11 @@
public class Tph7 { public class Tph7 {
m(a,b) {
m(a,b){
var c = m2(b); var c = m2(b);
return m2(b); return m2(b);
} }
m2(b) { m2(b){
return b; return b;
} }
} }