← Back to branch summary

~ubuntu-branches/ubuntu/precise/asm3/precise

« back to all changes in this revision

Viewing changes to src/org/objectweb/asm/tree/analysis/SimpleVerifier.java

  • Committer: Package Import Robot
  • Author(s): Torsten Werner
  • Date: 2011-09-12 13:50:38 UTC
  • mfrom: (3.2.5 sid)
  • Revision ID: package-import@ubuntu.com-20110912135038-1g97tsp2uopphgm7
Tags: 3.3.2-1
* Team upload.
* New upstream release.
* Change debian/watch to point to upstream's SVN repository. Add
  debian/orig-tar.sh.
* Remove all prebuilt jar files from orig tarball.
* Install asm-debug-all.jar.
* Do no longer install symlinks from asm3-all.jar to the individual jars.
  Install the real files instead.
* Use upstream provided pom files instead of shipping them in the debian
  directory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/org/objectweb/asm/tree/analysis/SimpleVerifier.java
141
141
        }
142
142
 
143
143
        Value v = super.newValue(type);
144
 
        if (v == BasicValue.REFERENCE_VALUE) {
 
144
        if (BasicValue.REFERENCE_VALUE.equals(v)) {
145
145
            if (isArray) {
146
146
                v = newValue(type.getElementType());
147
147
                String desc = ((BasicValue) v).getType().getDescriptor();
185
185
            case Type.FLOAT:
186
186
            case Type.LONG:
187
187
            case Type.DOUBLE:
188
 
                return type == expectedType;
 
188
                return type.equals(expectedType);
189
189
            case Type.ARRAY:
190
190
            case Type.OBJECT:
191
191
                if ("Lnull;".equals(type.getDescriptor())) {
267
267
            if (getSuperClass(u) == null) {
268
268
                return false;
269
269
            } else {
 
270
                if (isInterface) {
 
271
                    return u.getSort() == Type.OBJECT || u.getSort() == Type.ARRAY;
 
272
                }
270
273
                return isAssignableFrom(t, getSuperClass(u));
271
274
            }
272
275
        }
284
287
            }
285
288
            return false;
286
289
        }
287
 
        return getClass(t).isAssignableFrom(getClass(u));
 
290
        Class tc = getClass(t);
 
291
        if (tc.isInterface()) {
 
292
            tc = Object.class;
 
293
        }
 
294
        return tc.isAssignableFrom(getClass(u));
288
295
    }
289
296
 
290
297
    protected Class getClass(final Type t) {