浏览代码

349636: debug

tags/V1_6_12M2
aclement 13 年前
父节点
当前提交
f7b11932d5
共有 1 个文件被更改,包括 7 次插入4 次删除
  1. 7
    4
      weaver/src/org/aspectj/weaver/bcel/Utility.java

+ 7
- 4
weaver/src/org/aspectj/weaver/bcel/Utility.java 查看文件

BcelWorld.makeBcelType(signature.getReturnType()), BcelWorld.makeBcelTypes(signature.getParameterTypes()), kind); BcelWorld.makeBcelType(signature.getReturnType()), BcelWorld.makeBcelTypes(signature.getParameterTypes()), kind);
} }


// XXX don't need the world now
public static Instruction createInvoke(InstructionFactory fact, BcelWorld world, Member signature) { public static Instruction createInvoke(InstructionFactory fact, BcelWorld world, Member signature) {
short kind; short kind;
int signatureModifiers = signature.getModifiers(); int signatureModifiers = signature.getModifiers();
if (!toType.isConvertableFrom(fromType) && !fromType.isConvertableFrom(toType)) { if (!toType.isConvertableFrom(fromType) && !fromType.isConvertableFrom(toType)) {
throw new BCException("can't convert from " + fromType + " to " + toType); throw new BCException("can't convert from " + fromType + " to " + toType);
} }
// XXX I'm sure this test can be simpler but my brain hurts and this
// works
if (!toType.getWorld().isInJava5Mode()) {
// XXX I'm sure this test can be simpler but my brain hurts and this works
World w = toType.getWorld();
if (w == null) { // dbg349636
throw new IllegalStateException("Debug349636: Unexpectedly found world null for type " + toType.getName());
}

if (!w.isInJava5Mode()) {
if (toType.needsNoConversionFrom(fromType)) { if (toType.needsNoConversionFrom(fromType)) {
return; return;
} }

正在加载...
取消
保存