Update cts tests to be compatible for both art and dalvik.
- Removes tests that check that certain integral types can't be put into
other integral types, ie. an int value of 2 put into a boolean. Dalvik
disallows this, but art allows this. However, the instruction type must
still match the array or field type.
- Changed how some invoke tests are run to trigger a runtime exception
expected in art, as well as a verification error expected in dalvik.
- Changed some invoke tests to allow NoSuchMethodError expected in dalvik
and VerifyError expected in art, with art being closer to the RI.
- Fixed various bytecodes to have proper arguments because art has
stricter checks.
Bug: 10135051
Change-Id: I48fbf24d5f07faf23bb404685998bd358846b76b
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/Test_aput_boolean.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/Test_aput_boolean.java
index 43df2b2..f4fe940 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/Test_aput_boolean.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/Test_aput_boolean.java
@@ -175,19 +175,6 @@
DxUtil.checkVerifyException(t);
}
}
-
- /**
- * @constraint B15
- * @title put value 2 into boolean array
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
/**
* @constraint B1
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_10.d b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_10.d
deleted file mode 100644
index 64eb60e..0000000
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_10.d
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; 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.
-
-.source T_aput_boolean_10.java
-.class public dot.junit.opcodes.aput_boolean.d.T_aput_boolean_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([ZIZ)V
-.limit regs 11
-
- const v10, 2
- aput-boolean v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/Test_aput_byte.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/Test_aput_byte.java
index 96ef2b6..396e5b7 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/Test_aput_byte.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/Test_aput_byte.java
@@ -178,19 +178,6 @@
}
/**
- * @constraint B15
- * @title put value 128 into byte array
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.aput_byte.d.T_aput_byte_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
* @constraint B1
* @title Type of index argument - float. The verifier checks that ints
* and floats are not used interchangeably.
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_10.d b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_10.d
deleted file mode 100644
index b65ae76..0000000
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; 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.
-
-.source T_aput_byte_10.java
-.class public dot.junit.opcodes.aput_byte.d.T_aput_byte_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([BIB)V
-.limit regs 11
-
- const v10, 128
- aput-byte v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/Test_aput_char.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/Test_aput_char.java
index 66265c7..8698034 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/Test_aput_char.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/Test_aput_char.java
@@ -192,17 +192,4 @@
}
}
- /**
- * @constraint B15
- * @title put value 65536 into char array
- */
- public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.aput_char.d.T_aput_char_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_10.d b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_10.d
deleted file mode 100644
index dd68792..0000000
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; 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.
-
-.source T_aput_char_10.java
-.class public dot.junit.opcodes.aput_char.d.T_aput_char_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([CIC)V
-.limit regs 11
-
- const v10, 65536
- aput-char v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/Test_aput_short.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/Test_aput_short.java
index 82959db..a3dcf18 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/Test_aput_short.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/Test_aput_short.java
@@ -175,19 +175,6 @@
DxUtil.checkVerifyException(t);
}
}
-
- /**
- * @constraint B15
- * @title put value 32768 into array of shorts
- */
- public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.aput_short.d.T_aput_short_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
/**
* @constraint B1
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_10.d b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_10.d
deleted file mode 100644
index bbb541c..0000000
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_10.d
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; 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.
-
-.source T_aput_short_10.java
-.class public dot.junit.opcodes.aput_short.d.T_aput_short_10
-.super java/lang/Object
-
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run([SIS)V
-.limit regs 11
-
- const v10, 32768
- aput-short v10, v8, v9
- return-void
-.end method
-
-
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_21.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_21.d
index eff1f49..e806df2 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_21.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_21.d
@@ -30,7 +30,7 @@
new-instance v0, Ldot/junit/opcodes/iget_short/TestStubs;
invoke-direct {v0}, dot/junit/opcodes/iget_short/TestStubs/<init>()V
- iget-wide v1, v0, dot.junit.opcodes.iget_short.TestStubs.TestStubProtectedField S
+ iget-short v1, v0, dot.junit.opcodes.iget_short.TestStubs.TestStubProtectedField S
return-void
.end method
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/Test_invoke_direct.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/Test_invoke_direct.java
index e7c6a0b..1772f22 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/Test_invoke_direct.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/Test_invoke_direct.java
@@ -23,6 +23,7 @@
import dot.junit.opcodes.invoke_direct.d.T_invoke_direct_16;
import dot.junit.opcodes.invoke_direct.d.T_invoke_direct_2;
import dot.junit.opcodes.invoke_direct.d.T_invoke_direct_21;
+import dot.junit.opcodes.invoke_direct.d.T_invoke_direct_26;
import dot.junit.opcodes.invoke_direct.d.T_invoke_direct_6;
import dot.junit.opcodes.invoke_direct.d.T_invoke_direct_7;
import dot.junit.opcodes.invoke_direct.d.T_invoke_direct_8;
@@ -276,8 +277,10 @@
//@uses dot.junit.opcodes.invoke_direct.TAbstract
try {
new T_invoke_direct_13().run();
- fail("expected NoSuchMethodError");
+ fail("expected NoSuchMethodError or verification exception");
} catch (NoSuchMethodError t) {
+ } catch (Throwable t) {
+ DxUtil.checkVerifyException(t);
}
}
@@ -314,8 +317,9 @@
* @title attempt to invoke interface method
*/
public void testVFE20() {
+ //@uses dot.junit.opcodes.invoke_direct.d.T_invoke_direct_26
try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_26");
+ new T_invoke_direct_26().run();
fail("expected a verification exception");
} catch (Throwable t) {
DxUtil.checkVerifyException(t);
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_12.d b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_12.d
index 6230fa9..9f79d59 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_12.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_12.d
@@ -27,7 +27,7 @@
.method public run()I
.limit regs 3
- invoke-direct {v1}, dot/junit/opcodes/invoke_direct/TSuper/toIntPvt()I
+ invoke-direct {v2}, dot/junit/opcodes/invoke_direct/TSuper/toIntPvt()I
move-result v0
return v0
.end method
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_26.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_26.java
new file mode 100644
index 0000000..970478f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_26.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * 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.
+ */
+
+package dot.junit.opcodes.invoke_direct.d;
+
+public class T_invoke_direct_26 {
+
+ public int run() {
+ return 0;
+ }
+}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_4.d b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_4.d
index e6e7511..ed919f9 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_4.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_4.d
@@ -27,6 +27,7 @@
.end method
.method public run()V
- invoke-direct {v0}, dot/junit/opcodes/invoke_direct/d/T_invoke_direct_4/<clinit>()V
+ invoke-direct {}, dot/junit/opcodes/invoke_direct/d/T_invoke_direct_4/<clinit>()V
+ return-void
.end method
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/Test_invoke_direct_range.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/Test_invoke_direct_range.java
index 1682c68..d4f194b 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/Test_invoke_direct_range.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/Test_invoke_direct_range.java
@@ -23,6 +23,7 @@
import dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_16;
import dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_2;
import dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_21;
+import dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_26;
import dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_6;
import dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_7;
import dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_8;
@@ -277,8 +278,10 @@
//@uses dot.junit.opcodes.invoke_direct_range.TAbstract
try {
new T_invoke_direct_range_13().run();
- fail("expected NoSuchMethodError");
+ fail("expected NoSuchMethodError or verification exception");
} catch (NoSuchMethodError t) {
+ } catch (Throwable t) {
+ DxUtil.checkVerifyException(t);
}
}
@@ -315,8 +318,9 @@
* @title attempt to invoke interface method
*/
public void testVFE20() {
+ //@uses dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_26
try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_26");
+ new T_invoke_direct_range_26().run();
fail("expected a verification exception");
} catch (Throwable t) {
DxUtil.checkVerifyException(t);
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_12.d b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_12.d
index a107ac3..7dd13f0 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_12.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_12.d
@@ -27,7 +27,7 @@
.method public run()I
.limit regs 3
- invoke-direct/range {v1}, dot/junit/opcodes/invoke_direct_range/TSuper/toIntPvt()I
+ invoke-direct/range {v2}, dot/junit/opcodes/invoke_direct_range/TSuper/toIntPvt()I
move-result v0
return v0
.end method
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_26.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_26.java
new file mode 100644
index 0000000..b0ad389
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_26.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * 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.
+ */
+
+package dot.junit.opcodes.invoke_direct_range.d;
+
+public class T_invoke_direct_range_26 {
+
+ public int run() {
+ return 0;
+ }
+}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/Test_invoke_interface.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/Test_invoke_interface.java
index ae06cda..f846374 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/Test_invoke_interface.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/Test_invoke_interface.java
@@ -166,8 +166,9 @@
public void testVFE2() {
try {
new T_invoke_interface_4().run();
- fail("expected NoSuchMethodError");
+ fail("expected NoSuchMethodError or IncompatibleClassChangeError");
} catch (NoSuchMethodError t) {
+ } catch (IncompatibleClassChangeError e) {
}
}
@@ -216,13 +217,13 @@
* @title invoke-interface may not be used to call <init>.
*/
public void testVFE10() {
- //@uses dot.junit.opcodes.invoke_interface.ITest
- //@uses dot.junit.opcodes.invoke_interface.ITestImpl
- //@uses dot.junit.opcodes.invoke_interface.ITestImplAbstract
+ //@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_18
try {
new T_invoke_interface_18().run(new ITestImpl());
- fail("expected InstantiationError");
- } catch (InstantiationError t) {
+ fail("expected NoSuchMethodError or verification exception");
+ } catch (NoSuchMethodError t) {
+ } catch (Throwable t) {
+ DxUtil.checkVerifyException(t);
}
}
@@ -235,8 +236,10 @@
//@uses dot.junit.opcodes.invoke_interface.ITestImpl
try {
new T_invoke_interface_20().run(new ITestImpl());
- fail("expected NoSuchMethodError");
+ fail("expected NoSuchMethodError or verification exception");
} catch (NoSuchMethodError t) {
+ } catch (Throwable t) {
+ DxUtil.checkVerifyException(t);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_18.d b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_18.d
index f792a3b..d974005 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_18.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_18.d
@@ -20,14 +20,7 @@
.method public <init>()V
.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_interface/ITest;)V
-.limit regs 8
- new-instance v2, dot/junit/opcodes/invoke_interface/ITestImplAbstract
- invoke-interface {v2}, dot/junit/opcodes/invoke_interface/ITestImplAbstract/<init>()V
+ invoke-interface {v1}, java/lang/Object/<init>()V
return-void
.end method
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/Test_invoke_interface_range.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/Test_invoke_interface_range.java
index abb4855..9f98d4c 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/Test_invoke_interface_range.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/Test_invoke_interface_range.java
@@ -143,8 +143,9 @@
public void testVFE2() {
try {
new T_invoke_interface_range_4().run();
- fail("expected NoSuchMethodError");
+ fail("expected NoSuchMethodError or IncompatibleClassChangeError");
} catch (NoSuchMethodError t) {
+ } catch (IncompatibleClassChangeError e) {
}
}
@@ -193,13 +194,13 @@
* @title invoke-interface may not be used to call <init>.
*/
public void testVFE10() {
- //@uses dot.junit.opcodes.invoke_interface_range.ITest
- //@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- //@uses dot.junit.opcodes.invoke_interface_range.ITestImplAbstract
+ //@uses dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_18
try {
new T_invoke_interface_range_18().run(new ITestImpl());
- fail("expected InstantiationError");
- } catch (InstantiationError t) {
+ fail("expected NoSuchMethodError or verification exception");
+ } catch (NoSuchMethodError t) {
+ } catch (Throwable t) {
+ DxUtil.checkVerifyException(t);
}
}
@@ -212,8 +213,10 @@
//@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
try {
new T_invoke_interface_range_20().run(new ITestImpl());
- fail("expected NoSuchMethodError");
+ fail("expected NoSuchMethodError or verification exception");
} catch (NoSuchMethodError t) {
+ } catch (Throwable t) {
+ DxUtil.checkVerifyException(t);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_18.d b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_18.d
index 0174a71..014b348 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_18.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_18.d
@@ -20,14 +20,7 @@
.method public <init>()V
.limit regs 2
- invoke-direct {v1}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run(Ldot/junit/opcodes/invoke_interface_range/ITest;)V
-.limit regs 8
- new-instance v2, dot/junit/opcodes/invoke_interface_range/ITestImplAbstract
- invoke-interface/range {v2}, dot/junit/opcodes/invoke_interface_range/ITestImplAbstract/<init>()V
+ invoke-interface/range {v1}, java/lang/Object/<init>()V
return-void
.end method
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/Test_invoke_static.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/Test_invoke_static.java
index c7b77aa..02793fd 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/Test_invoke_static.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/Test_invoke_static.java
@@ -26,6 +26,7 @@
import dot.junit.opcodes.invoke_static.d.T_invoke_static_18;
import dot.junit.opcodes.invoke_static.d.T_invoke_static_19;
import dot.junit.opcodes.invoke_static.d.T_invoke_static_2;
+import dot.junit.opcodes.invoke_static.d.T_invoke_static_24;
import dot.junit.opcodes.invoke_static.d.T_invoke_static_4;
import dot.junit.opcodes.invoke_static.d.T_invoke_static_5;
import dot.junit.opcodes.invoke_static.d.T_invoke_static_6;
@@ -156,8 +157,9 @@
public void testVFE5() {
try {
new T_invoke_static_19().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
+ fail("expected a verification exception");
+ } catch (Throwable t) {
+ DxUtil.checkVerifyException(t);
}
}
@@ -260,8 +262,9 @@
* @title attempt to invoke interface method
*/
public void testVFE18() {
+ //@uses dot.junit.opcodes.invoke_static.d.T_invoke_static_24
try {
- Class.forName("dot.junit.opcodes.invoke_static.d.T_invoke_static_24");
+ new T_invoke_static_24().run();
fail("expected a verification exception");
} catch (Throwable t) {
DxUtil.checkVerifyException(t);
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_24.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_24.java
new file mode 100644
index 0000000..90e404d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_24.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * 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.
+ */
+
+package dot.junit.opcodes.invoke_static.d;
+
+public class T_invoke_static_24 {
+ public void run() {
+ }
+}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/Test_invoke_static_range.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/Test_invoke_static_range.java
index c62b333..7db6776 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/Test_invoke_static_range.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/Test_invoke_static_range.java
@@ -26,6 +26,7 @@
import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_18;
import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_19;
import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_2;
+import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_24;
import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_4;
import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_5;
import dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_6;
@@ -155,8 +156,9 @@
public void testVFE5() {
try {
new T_invoke_static_range_19().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
+ fail("expected a verification exception");
+ } catch (Throwable t) {
+ DxUtil.checkVerifyException(t);
}
}
@@ -259,8 +261,9 @@
* @title attempt to invoke interface method
*/
public void testVFE18() {
+ //@uses dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_24
try {
- Class.forName("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_24");
+ new T_invoke_static_range_24().run();
fail("expected a verification exception");
} catch (Throwable t) {
DxUtil.checkVerifyException(t);
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_24.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_24.java
new file mode 100644
index 0000000..84e6831
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_24.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * 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.
+ */
+
+package dot.junit.opcodes.invoke_static_range.d;
+
+public class T_invoke_static_range_24 {
+ public void run() {
+ }
+}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/Test_invoke_super.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/Test_invoke_super.java
index 6efac8b..b1602b6 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/Test_invoke_super.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/Test_invoke_super.java
@@ -27,6 +27,7 @@
import dot.junit.opcodes.invoke_super.d.T_invoke_super_19;
import dot.junit.opcodes.invoke_super.d.T_invoke_super_2;
import dot.junit.opcodes.invoke_super.d.T_invoke_super_20;
+import dot.junit.opcodes.invoke_super.d.T_invoke_super_24;
import dot.junit.opcodes.invoke_super.d.T_invoke_super_4;
import dot.junit.opcodes.invoke_super.d.T_invoke_super_5;
import dot.junit.opcodes.invoke_super.d.T_invoke_super_6;
@@ -142,8 +143,9 @@
public void testVFE3() {
try {
new T_invoke_super_10().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
+ fail("expected a verification exception");
+ } catch (Throwable t) {
+ DxUtil.checkVerifyException(t);
}
}
@@ -324,8 +326,9 @@
* @title attempt to invoke interface method
*/
public void testVFE18() {
+ //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_24
try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_24");
+ new T_invoke_super_24().run();
fail("expected a verification exception");
} catch (Throwable t) {
DxUtil.checkVerifyException(t);
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_24.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_24.java
new file mode 100644
index 0000000..38ebc44
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_24.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * 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.
+ */
+
+package dot.junit.opcodes.invoke_super.d;
+
+public class T_invoke_super_24 {
+
+ public int run() {
+ return 0;
+ }
+}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/Test_invoke_super_range.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/Test_invoke_super_range.java
index d65b8d4..51291f1 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/Test_invoke_super_range.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/Test_invoke_super_range.java
@@ -27,6 +27,7 @@
import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_19;
import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_2;
import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_20;
+import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_24;
import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_4;
import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_5;
import dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_6;
@@ -142,8 +143,9 @@
public void testVFE3() {
try {
new T_invoke_super_range_10().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
+ fail("expected a verification exception");
+ } catch (Throwable t) {
+ DxUtil.checkVerifyException(t);
}
}
@@ -324,8 +326,9 @@
* @title attempt to invoke interface method
*/
public void testVFE18() {
+ //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_24
try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_24");
+ new T_invoke_super_range_24().run();
fail("expected a verification exception");
} catch (Throwable t) {
DxUtil.checkVerifyException(t);
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_24.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_24.java
new file mode 100644
index 0000000..d1c8a31
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_24.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * 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.
+ */
+
+package dot.junit.opcodes.invoke_super_range.d;
+
+public class T_invoke_super_range_24 {
+
+ public int run() {
+ return 0;
+ }
+}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/Test_invoke_virtual.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/Test_invoke_virtual.java
index 6e41ec1..03f2bb6 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/Test_invoke_virtual.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/Test_invoke_virtual.java
@@ -26,6 +26,7 @@
import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_18;
import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_19;
import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_20;
+import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_24;
import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_4;
import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_5;
import dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_6;
@@ -139,8 +140,9 @@
public void testVFE3() {
try {
new T_invoke_virtual_10().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
+ fail("expected a verification exception");
+ } catch (Throwable t) {
+ DxUtil.checkVerifyException(t);
}
}
@@ -316,8 +318,9 @@
* @title attempt to invoke interface method
*/
public void testVFE18() {
+ //@uses dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_24
try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_24");
+ new T_invoke_virtual_24().run();
fail("expected a verification exception");
} catch (Throwable t) {
DxUtil.checkVerifyException(t);
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_24.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_24.java
new file mode 100644
index 0000000..02e2efd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_24.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * 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.
+ */
+
+package dot.junit.opcodes.invoke_virtual.d;
+
+public class T_invoke_virtual_24 {
+
+ public int run() {
+ return 0;
+ }
+}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/Test_invoke_virtual_range.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/Test_invoke_virtual_range.java
index 2368dc3..6200ce7 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/Test_invoke_virtual_range.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/Test_invoke_virtual_range.java
@@ -27,6 +27,7 @@
import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_19;
import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_2;
import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_20;
+import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_24;
import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_4;
import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_5;
import dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_6;
@@ -148,8 +149,9 @@
public void testVFE3() {
try {
new T_invoke_virtual_range_10().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
+ fail("expected a verification exception");
+ } catch (Throwable t) {
+ DxUtil.checkVerifyException(t);
}
}
@@ -324,8 +326,9 @@
* @title attempt to invoke interface method
*/
public void testVFE18() {
+ //@uses dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_24
try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_24");
+ new T_invoke_virtual_range_24().run();
fail("expected a verification exception");
} catch (Throwable t) {
DxUtil.checkVerifyException(t);
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_24.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_24.java
new file mode 100644
index 0000000..8ad860d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_24.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * 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.
+ */
+
+package dot.junit.opcodes.invoke_virtual_range.d;
+
+public class T_invoke_virtual_range_24 {
+
+ public int run() {
+ return 0;
+ }
+}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/Test_iput_boolean.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/Test_iput_boolean.java
index 6a2419b..5736c7c 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/Test_iput_boolean.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/Test_iput_boolean.java
@@ -124,20 +124,6 @@
/**
*
* @constraint B14
- * @title put value '2' into boolean field
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B14
* @title type of field doesn't match opcode - attempt to modify double
* field with single-width register
*/
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_6.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_6.d
deleted file mode 100644
index 29230ed..0000000
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; 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.
-
-.source T_iput_boolean_6.java
-.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_6
-.super java/lang/Object
-
-.field public s Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
- const v2, 2
- iput-boolean v2, v5, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_6.s Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/Test_iput_byte.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/Test_iput_byte.java
index f67e22b..d421980 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/Test_iput_byte.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/Test_iput_byte.java
@@ -122,20 +122,6 @@
/**
*
* @constraint B14
- * @title put value '256' into byte field
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B14
* @title type of field doesn't match opcode - attempt to modify double
* field with single-width register
*/
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_21.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_21.d
index 9f8bd0f..78dde15 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_21.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_21.d
@@ -16,7 +16,7 @@
.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_21
.super java/lang/Object
-.field public st_s I
+.field public st_s S
.method public <init>()V
.limit regs 1
@@ -28,7 +28,7 @@
.method public run()V
.limit regs 4
const v0, 12
- iput-byte v0, v3, dot.junit.opcodes.iput_byte.d.T_iput_byte_21.st_s I
+ iput-byte v0, v3, dot.junit.opcodes.iput_byte.d.T_iput_byte_21.st_s S
return-void
.end method
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_22.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_22.d
index e0a19be..a81dfb6 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_22.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_22.d
@@ -16,7 +16,7 @@
.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_22
.super java/lang/Object
-.field public st_b I
+.field public st_i I
.method public <init>()V
.limit regs 1
@@ -28,7 +28,7 @@
.method public run()V
.limit regs 4
const v0, 1
- iput-byte v0, v3, dot.junit.opcodes.iput_byte.d.T_iput_byte_22.st_b I
+ iput-byte v0, v3, dot.junit.opcodes.iput_byte.d.T_iput_byte_22.st_i I
return-void
.end method
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_6.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_6.d
deleted file mode 100644
index d349e8e..0000000
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; 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.
-
-.source T_iput_byte_6.java
-.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_6
-.super java/lang/Object
-
-.field public st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 256
- iput-byte v0, v2, dot.junit.opcodes.iput_byte.d.T_iput_byte_6.st_i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/Test_iput_char.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/Test_iput_char.java
index f3a4f9e..87634c7 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/Test_iput_char.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/Test_iput_char.java
@@ -123,20 +123,6 @@
/**
*
* @constraint B14
- * @title put value '66000' into byte field
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B14
* @title type of field doesn't match opcode - attempt to modify double
* field with single-width register
*/
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_6.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_6.d
deleted file mode 100644
index 5614d67..0000000
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; 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.
-
-.source T_iput_char_6.java
-.class public dot.junit.opcodes.iput_char.d.T_iput_char_6
-.super java/lang/Object
-
-.field public st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 66000
- iput-char v0, v2, dot.junit.opcodes.iput_char.d.T_iput_char_6.st_i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/Test_iput_short.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/Test_iput_short.java
index 0ea32e5..1895953 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/Test_iput_short.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/Test_iput_short.java
@@ -124,20 +124,6 @@
/**
*
* @constraint B14
- * @title put value '66000' into byte field
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B14
* @title type of field doesn't match opcode - attempt to modify double
* field with single-width register
*/
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_6.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_6.d
deleted file mode 100644
index ba79d41..0000000
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; 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.
-
-.source T_iput_short_6.java
-.class public dot.junit.opcodes.iput_short.d.T_iput_short_6
-.super java/lang/Object
-
-.field public st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 66000
- iput-short v0, v2, dot.junit.opcodes.iput_short.d.T_iput_short_6.st_i1 S
- return-void
-.end method
-
-
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_3.d b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_3.d
index 7417a8e..9ad99fc 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_3.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_3.d
@@ -29,5 +29,6 @@
const/4 v5, 0
monitor-enter v5
+ monitor-exit v5
return-void
.end method
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_1.d b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_1.d
index bef8390..1f83d57 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_1.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_1.d
@@ -32,6 +32,9 @@
.method public run(Ljava/lang/Object;)V
.limit regs 5
+ new-instance v2, java/lang/Object
+ invoke-direct {v2}, java/lang/Object/<init>()V
+ monitor-enter v2
monitor-exit v3
return-void
.end method
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_3.d b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_3.d
index 2410da3..1ab9dc1 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_3.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_3.d
@@ -27,6 +27,9 @@
.method private declared_synchronized test()F
.limit regs 4
+ new-instance v2, java/lang/Object
+ invoke-direct {v2}, java/lang/Object/<init>()V
+ monitor-enter v2
monitor-exit v3
const v0, 1.0
return v0
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_12.d b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_12.d
index e096f4c..67366f6 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_12.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_12.d
@@ -50,4 +50,4 @@
return v1
.catch java/lang/RuntimeException from Label0 to Label1 using Label1
-.end method
\ No newline at end of file
+.end method
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_5.d b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_5.d
index 4e23269..f37a447 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_5.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_5.d
@@ -27,6 +27,9 @@
.method public declared_synchronized run()V
.limit regs 6
+ new-instance v2, java/lang/Object
+ invoke-direct {v2}, java/lang/Object/<init>()V
+ monitor-enter v2
monitor-exit v5
new-instance v1, java/lang/NullPointerException
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_8.d b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_8.d
index bc2f85f..e82e7d6 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_8.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_8.d
@@ -26,7 +26,10 @@
.method private declared_synchronized test()Ljava/lang/String;
.limit regs 4
-
+
+ new-instance v2, java/lang/Object
+ invoke-direct {v2}, java/lang/Object/<init>()V
+ monitor-enter v2
monitor-exit v3
const-string v0, "abc"
return-object v0
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/d/T_return_void_3.d b/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/d/T_return_void_3.d
index ff12b06..b6bad32 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/d/T_return_void_3.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/d/T_return_void_3.d
@@ -25,9 +25,12 @@
.end method
.method private declared_synchronized test()V
-.limit regs 1
+.limit regs 2
- monitor-exit v0
+ new-instance v0, java/lang/Object
+ invoke-direct {v0}, java/lang/Object/<init>()V
+ monitor-enter v0
+ monitor-exit v1
return-void
.end method
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_3.d b/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_3.d
index 1a6fdb6..479e777 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_3.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_3.d
@@ -27,6 +27,9 @@
.method private declared_synchronized test()D
.limit regs 4
+ new-instance v2, java/lang/Object
+ invoke-direct {v2}, java/lang/Object/<init>()V
+ monitor-enter v2
monitor-exit v3
const-wide v0, 1.0
return-wide v0
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/Test_sput_boolean.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/Test_sput_boolean.java
index f503ec6..1b8d96c 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/Test_sput_boolean.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/Test_sput_boolean.java
@@ -125,20 +125,6 @@
/**
*
* @constraint B13
- * @title put value '2' into boolean field
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
* @title type of field doesn't match opcode - attempt to modify double
* field with single-width register
*/
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_6.d b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_6.d
deleted file mode 100644
index d50c573..0000000
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; 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.
-
-.source T_sput_boolean_6.java
-.class public dot.junit.opcodes.sput_boolean.d.T_sput_boolean_6
-.super java/lang/Object
-
-.field public static s Z
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 6
-
- const v2, 2
- sput-boolean v2, dot.junit.opcodes.sput_boolean.d.T_sput_boolean_6.s Z
- return-void
-.end method
-
-
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/Test_sput_byte.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/Test_sput_byte.java
index c64f876..5ac828d 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/Test_sput_byte.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/Test_sput_byte.java
@@ -123,20 +123,6 @@
/**
*
* @constraint B13
- * @title put value '256' into byte field
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
* @title type of field doesn't match opcode - attempt to modify double
* field with single-width register
*/
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_21.d b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_21.d
index 15a924b..e643cb9 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_21.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_21.d
@@ -16,7 +16,7 @@
.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_21
.super java/lang/Object
-.field public static st_s I
+.field public static st_s S
.method public <init>()V
.limit regs 1
@@ -28,7 +28,7 @@
.method public run()V
.limit regs 4
const v0, 12
- sput-byte v0, dot.junit.opcodes.sput_byte.d.T_sput_byte_21.st_s I
+ sput-byte v0, dot.junit.opcodes.sput_byte.d.T_sput_byte_21.st_s S
return-void
.end method
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_22.d b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_22.d
index 3501490..7a59d06 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_22.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_22.d
@@ -16,7 +16,7 @@
.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_22
.super java/lang/Object
-.field public static st_b I
+.field public static st_i I
.method public <init>()V
.limit regs 1
@@ -28,7 +28,7 @@
.method public run()V
.limit regs 4
const v0, 1
- sput-byte v0, dot.junit.opcodes.sput_byte.d.T_sput_byte_22.st_b I
+ sput-byte v0, dot.junit.opcodes.sput_byte.d.T_sput_byte_22.st_i I
return-void
.end method
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_6.d b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_6.d
deleted file mode 100644
index f41929a..0000000
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; 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.
-
-.source T_sput_byte_6.java
-.class public dot.junit.opcodes.sput_byte.d.T_sput_byte_6
-.super java/lang/Object
-
-.field public static st_i1 B
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 256
- sput-byte v0, dot.junit.opcodes.sput_byte.d.T_sput_byte_6.st_i1 B
- return-void
-.end method
-
-
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/Test_sput_char.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/Test_sput_char.java
index 120b45a..8585365 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/Test_sput_char.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/Test_sput_char.java
@@ -123,20 +123,6 @@
/**
*
* @constraint B13
- * @title put value '66000' into byte field
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
* @title type of field doesn't match opcode - attempt to modify double
* field with single-width register
*/
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_6.d b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_6.d
deleted file mode 100644
index a2e504a..0000000
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; 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.
-
-.source T_sput_char_6.java
-.class public dot.junit.opcodes.sput_char.d.T_sput_char_6
-.super java/lang/Object
-
-.field public static st_i1 C
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 66000
- sput-char v0, dot.junit.opcodes.sput_char.d.T_sput_char_6.st_i1 C
- return-void
-.end method
-
-
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/Test_sput_short.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/Test_sput_short.java
index f14c4a7..5fcbe58 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/Test_sput_short.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/Test_sput_short.java
@@ -123,20 +123,6 @@
/**
*
* @constraint B13
- * @title put value '66000' into byte field
- */
- public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
- }
-
- /**
- *
- * @constraint B13
* @title type of field doesn't match opcode - attempt to modify double
* field with single-width register
*/
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_6.d b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_6.d
deleted file mode 100644
index 1b3904f..0000000
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_6.d
+++ /dev/null
@@ -1,36 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; 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.
-
-.source T_sput_short_6.java
-.class public dot.junit.opcodes.sput_short.d.T_sput_short_6
-.super java/lang/Object
-
-.field public static st_i1 S
-
-.method public <init>()V
-.limit regs 1
-
- invoke-direct {v0}, java/lang/Object/<init>()V
- return-void
-.end method
-
-.method public run()V
-.limit regs 3
-
- const v0, 66000
- sput-short v0, dot.junit.opcodes.sput_short.d.T_sput_short_6.st_i1 S
- return-void
-.end method
-
-