diff options
| author | Brian Carlstrom <bdc@google.com> | 2015-01-08 08:24:06 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2015-01-08 09:27:15 -0800 |
| commit | 2270795fbe0b277bfd49f40950ecaa78583175cc (patch) | |
| tree | 9ac962825d41c4fb8ad1ec0fc2e8b441b42d3869 /src/proguard/evaluation/BasicInvocationUnit.java | |
| parent | 9961286c06c25cd03464d3e2b00bd9b9dedf96ba (diff) | |
| download | android_external_proguard-2270795fbe0b277bfd49f40950ecaa78583175cc.tar.gz android_external_proguard-2270795fbe0b277bfd49f40950ecaa78583175cc.tar.bz2 android_external_proguard-2270795fbe0b277bfd49f40950ecaa78583175cc.zip | |
Upgrade Proguard to 5.1.
Downloaded from:
http://sourceforge.net/projects/proguard/files/proguard/5.1/
Bug: 17550647
Change-Id: I2b4eab16eb7821fc232b294ab7f433aae08f71e1
Diffstat (limited to 'src/proguard/evaluation/BasicInvocationUnit.java')
| -rw-r--r-- | src/proguard/evaluation/BasicInvocationUnit.java | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/proguard/evaluation/BasicInvocationUnit.java b/src/proguard/evaluation/BasicInvocationUnit.java index 474556c..f7cc902 100644 --- a/src/proguard/evaluation/BasicInvocationUnit.java +++ b/src/proguard/evaluation/BasicInvocationUnit.java @@ -2,7 +2,7 @@ * ProGuard -- shrinking, optimization, obfuscation, and preverification * of Java bytecode. * - * Copyright (c) 2002-2013 Eric Lafortune (eric@graphics.cornell.edu) + * Copyright (c) 2002-2014 Eric Lafortune (eric@graphics.cornell.edu) * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free @@ -68,7 +68,7 @@ implements InvocationUnit, // Initialize the parameters. boolean isStatic = - (method.getAccessFlags() & ClassConstants.INTERNAL_ACC_STATIC) != 0; + (method.getAccessFlags() & ClassConstants.ACC_STATIC) != 0; // Count the number of parameters, taking into account their categories. int parameterSize = ClassUtil.internalMethodParameterSize(descriptor, isStatic); @@ -225,7 +225,7 @@ implements InvocationUnit, // Push the return value, if applicable. String returnType = ClassUtil.internalMethodReturnType(type); - if (returnType.charAt(0) != ClassConstants.INTERNAL_TYPE_VOID) + if (returnType.charAt(0) != ClassConstants.TYPE_VOID) { stack.push(getMethodReturnValue(clazz, methodrefConstant, returnType)); } @@ -250,7 +250,7 @@ implements InvocationUnit, // Push the return value, if applicable. String returnType = ClassUtil.internalMethodReturnType(type); - if (returnType.charAt(0) != ClassConstants.INTERNAL_TYPE_VOID) + if (returnType.charAt(0) != ClassConstants.TYPE_VOID) { stack.push(getMethodReturnValue(clazz, invokeDynamicConstant, returnType)); } @@ -417,9 +417,4 @@ implements InvocationUnit, returnTypeClass = referencedClasses[referencedClasses.length - 1]; } } - - -// public void visitLibraryMember(LibraryClass libraryClass, LibraryMember libraryMember) -// { -// } } |