View | Details | Raw Unified | Return to bug 145018
Collapse All | Expand All

(-)src/org/aspectj/weaver/patterns/IfPointcut.java (-2 / +7 lines)
Lines 218-227 Link Here
218 
                        args.add(shadow.getThisEnclosingJoinPointStaticPartVar());
 218 
                        args.add(shadow.getThisEnclosingJoinPointStaticPartVar());
219 
                    } else {
 219 
                    } else {
220 
                        // we don't use i as JoinPoint.* can be anywhere in the signature in @style
 220 
                        // we don't use i as JoinPoint.* can be anywhere in the signature in @style
221 
                        ExposedState myState = new ExposedState(baseArgsCount);
222 
                        // ??? we throw out the test that comes from this walk. All we want here
223 
                        // is bindings for the arguments
224 
                        residueSource.findResidue(shadow, myState);
225 
                        Var v2 = myState.get(i);
221 
                        Var v = state.get(currentStateIndex++);
 226 
                        Var v = state.get(currentStateIndex++);
222 
                        args.add(v);
 227 
                        args.add(v2);
223 
                        ret = Test.makeAnd(ret,
 228 
                        ret = Test.makeAnd(ret,
224 
                            Test.makeInstanceof(v,
 229 
                            Test.makeInstanceof(v2,
225 
                                testMethod.getParameterTypes()[i].resolve(shadow.getIWorld())));
 230 
                                testMethod.getParameterTypes()[i].resolve(shadow.getIWorld())));
226 
                    }
 231 
                    }
227 
                }
 232 
                }
(-)src/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java (-1 / +2 lines)
Lines 99-105 Link Here
99 
		if (p instanceof AnnotationPointcut) return ANNOTATION;
 99 
		if (p instanceof AnnotationPointcut) return ANNOTATION;
100 
		if (p instanceof ArgsPointcut) return ARGS;
 100 
		if (p instanceof ArgsPointcut) return ARGS;
101 
		if (p instanceof ArgsAnnotationPointcut) return AT_ARGS;
 101 
		if (p instanceof ArgsAnnotationPointcut) return AT_ARGS;
102 
		if (p instanceof CflowPointcut) return CFLOW;
 102 
		if (p instanceof CflowPointcut || p instanceof ConcreteCflowPointcut)
103 
            return CFLOW;
103 
		if (p instanceof HandlerPointcut) return HANDLER;
 104 
		if (p instanceof HandlerPointcut) return HANDLER;
104 
		if (p instanceof IfPointcut) return IF;
 105 
		if (p instanceof IfPointcut) return IF;
105 
		if (p instanceof ThisOrTargetPointcut) return THIS_OR_TARGET;
 106 
		if (p instanceof ThisOrTargetPointcut) return THIS_OR_TARGET;

Return to bug 145018