diff options
| author | mikaelpeltier <mikaelpeltier@google.com> | 2014-08-25 16:15:29 +0200 |
|---|---|---|
| committer | mikaelpeltier <mikaelpeltier@google.com> | 2014-08-26 11:25:04 +0200 |
| commit | b4d4fcea81556bcce439e3efbbcc50bc2e4b7252 (patch) | |
| tree | 45efc138427e5f374628701c5f36f07e9f482dea | |
| parent | c7a18634636702c6e1eff155142c813d7e301910 (diff) | |
| download | toolchain_jack-b4d4fcea81556bcce439e3efbbcc50bc2e4b7252.tar.gz toolchain_jack-b4d4fcea81556bcce439e3efbbcc50bc2e4b7252.tar.bz2 toolchain_jack-b4d4fcea81556bcce439e3efbbcc50bc2e4b7252.zip | |
Fix bad assertion
- Update a shrob test to be compliant with the mapping format defined
into applyMapping method of MappingApplier.
Change-Id: Ic45a70f207812884f7653d2eb76124a3a735d74c
3 files changed, 3 insertions, 3 deletions
diff --git a/jack-tests/tests/com/android/jack/shrob/test036/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test036/proguard.flags001.mapping index a6c1c627..0bc22a58 100644 --- a/jack-tests/tests/com/android/jack/shrob/test036/proguard.flags001.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test036/proguard.flags001.mapping @@ -8,4 +8,4 @@ com.android.jack.shrob.test036.jack.E -> com.android.jack.shrob.test036.jack.Ren void <clinit>() -> renamed<clinit> com.android.jack.shrob.test036.jack.Kept -> com.android.jack.shrob.test036.jack.Kept: int[] -ESwitchesValues -> renamed-ESwitchesValues - int[] -getESwitchesValues() -> renamed-getESwitchesValues() + int[] -getESwitchesValues() -> renamed-getESwitchesValues diff --git a/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithMapping/expected-001.txt index 9cf0d78c..b37150c8 100644 --- a/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithMapping/expected-001.txt @@ -10,4 +10,4 @@ com.android.jack.shrob.test036.jack.Kept -> com.android.jack.shrob.test036.jack. int[] -ESwitchesValues -> renamed-ESwitchesValues void <init>() -> <init> int kept(com.android.jack.shrob.test036.jack.E) -> kept - int[] -getESwitchesValues() -> renamed-getESwitchesValues() + int[] -getESwitchesValues() -> renamed-getESwitchesValues diff --git a/jack/src/com/android/jack/ir/ast/JMethodId.java b/jack/src/com/android/jack/ir/ast/JMethodId.java index 2673cd6a..35ec1a72 100644 --- a/jack/src/com/android/jack/ir/ast/JMethodId.java +++ b/jack/src/com/android/jack/ir/ast/JMethodId.java @@ -146,7 +146,7 @@ public class JMethodId extends LocalMarkerManager implements HasName, CanBeRenam @Override public void setName(@Nonnull String newName) { - assert !(name.contains("(") || name.contains(")")); + assert !(newName.contains("(") || newName.contains(")")); this.name = StringInterner.get().intern(newName); } |