ART: Enable Checker annotations in smali files
Change-Id: I8eeb76154b5aa5506fc477d38cb56cae168cdc90
diff --git a/test/468-checker-bool-simplifier-regression/smali/TestCase.smali b/test/468-checker-bool-simplifier-regression/smali/TestCase.smali
index f36304d..6ff4391 100644
--- a/test/468-checker-bool-simplifier-regression/smali/TestCase.smali
+++ b/test/468-checker-bool-simplifier-regression/smali/TestCase.smali
@@ -18,6 +18,19 @@
.field public static value:Z
+# CHECK-START: boolean TestCase.testCase() boolean_simplifier (before)
+# CHECK-DAG: [[Const0:i\d+]] IntConstant 0
+# CHECK-DAG: [[Const1:i\d+]] IntConstant 1
+# CHECK-DAG: [[Value:z\d+]] StaticFieldGet
+# CHECK-DAG: If [ [[Value]] ]
+# CHECK-DAG: [[Phi:i\d+]] Phi [ [[Const1]] [[Const0]] ]
+# CHECK-DAG: Return [ [[Phi]] ]
+
+# CHECK-START: boolean TestCase.testCase() boolean_simplifier (after)
+# CHECK-DAG: [[Value:z\d+]] StaticFieldGet
+# CHECK-DAG: [[Not:z\d+]] BooleanNot [ [[Value]] ]
+# CHECK-DAG: Return [ [[Not]] ]
+
.method public static testCase()Z
.registers 2
sget-boolean v0, LTestCase;->value:Z
diff --git a/test/468-checker-bool-simplifier-regression/src/Main.java b/test/468-checker-bool-simplifier-regression/src/Main.java
index d45f3bf..8fe05c7 100644
--- a/test/468-checker-bool-simplifier-regression/src/Main.java
+++ b/test/468-checker-bool-simplifier-regression/src/Main.java
@@ -18,19 +18,6 @@
public class Main {
- // CHECK-START: boolean TestCase.testCase() boolean_simplifier (before)
- // CHECK-DAG: [[Const0:i\d+]] IntConstant 0
- // CHECK-DAG: [[Const1:i\d+]] IntConstant 1
- // CHECK-DAG: [[Value:z\d+]] StaticFieldGet
- // CHECK-DAG: If [ [[Value]] ]
- // CHECK-DAG: [[Phi:i\d+]] Phi [ [[Const1]] [[Const0]] ]
- // CHECK-DAG: Return [ [[Phi]] ]
-
- // CHECK-START: boolean TestCase.testCase() boolean_simplifier (after)
- // CHECK-DAG: [[Value:z\d+]] StaticFieldGet
- // CHECK-DAG: [[Not:z\d+]] BooleanNot [ [[Value]] ]
- // CHECK-DAG: Return [ [[Not]] ]
-
public static boolean runTest(boolean input) throws Exception {
Class<?> c = Class.forName("TestCase");
Method m = c.getMethod("testCase");
diff --git a/tools/checker.py b/tools/checker.py
index 0bce236..08ad57b 100755
--- a/tools/checker.py
+++ b/tools/checker.py
@@ -746,7 +746,8 @@
foundFiles = []
for root, dirs, files in os.walk(path):
for file in files:
- if os.path.splitext(file)[1] == ".java":
+ extension = os.path.splitext(file)[1]
+ if extension in [".java", ".smali"]:
foundFiles.append(os.path.join(root, file))
return foundFiles
else:
