Commitd64a936

authored

Merge pull request#20088 from aschackmull/java/joinorders1

Java: Improve several join-orders

2 parentsf697511 +d9f47bd commitd64a936Copy full SHA for d64a936

File tree

+24

-9

lines changed

+24

-9

lines changed

Lines changed: 13 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,13 @@ private predicate unificationTargets(RefType t1, Type t2) {`
`521`	`521`	`t2=a2.getComponentType()`
`522`	`522`	`)`
`523`	`523`	`or`
`524`		`-exists(ParameterizedTypept1,ParameterizedTypept2,intpos\|`
	`524`	`+unificationTargetsParameterized(_, _,t1,t2)`
	`525`	`+}`
	`526`	`+`
	`527`	`+privatepredicateunificationTargetsParameterized(`
	`528`	`+ParameterizedTypept1,ParameterizedTypept2,RefTypet1,RefTypet2`
	`529`	`+){`
	`530`	`+exists(intpos\|`
`525`	`531`	`unificationTargets(pt1,pt2)and`
`526`	`532`	`t1=pt1.getTypeArgument(pos)and`
`527`	`533`	`t2=pt2.getTypeArgument(pos)`
`@@ -565,10 +571,12 @@ private predicate hasParameterSubstitution(`
`565`	`571`	`GenericTypeg1,ParameterizedTypept1,GenericTypeg2,ParameterizedTypept2,TypeVariablev,`
`566`	`572`	`RefTypesubst`
`567`	`573`	`){`
`568`		`-unificationTargets(pt1,pt2)and`
`569`		`-exists(intpos\|hasSubstitution(pt1.getTypeArgument(pos),pt2.getTypeArgument(pos),v,subst))and`
`570`		`-g1=pt1.getGenericType()and`
`571`		`-g2=pt2.getGenericType()`
	`574`	`+exists(RefTypet1,RefTypet2\|`
	`575`	`+unificationTargetsParameterized(pt1,pt2,t1,t2)and`
	`576`	`+hasSubstitution(t1,t2,v,subst)and`
	`577`	`+g1=pt1.getGenericType()and`
	`578`	`+g2=pt2.getGenericType()`
	`579`	`+)`
`572`	`580`	`}`
`573`	`581`
`574`	`582`	`/**`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1261,14 +1261,21 @@ private Type erase(Type t) {`
`1261`	`1261`	`*`
`1262`	`1262`	`* For the definition of the notion of erasure see JLS v8, section 4.6 (Type Erasure).`
`1263`	`1263`	`*/`
	`1264`	`+bindingset[t1, t2]`
`1264`	`1265`	`overlay[caller?]`
`1265`		`-pragma[inline]`
	`1266`	`+pragma[inline_late]`
`1266`	`1267`	`predicatehaveIntersection(RefTypet1,RefTypet2){`
`1267`	`1268`	`exists(RefTypee1,RefTypee2\|e1=erase(t1)ande2=erase(t2)\|`
`1268`		`-erasedHaveIntersection(e1,e2)`
	`1269`	`+erasedHaveIntersectionFilter(e1,e2)`
`1269`	`1270`	`)`
`1270`	`1271`	`}`
`1271`	`1272`
	`1273`	`+bindingset[t1, t2]`
	`1274`	`+pragma[inline_late]`
	`1275`	`+privatepredicateerasedHaveIntersectionFilter(RefTypet1,RefTypet2){`
	`1276`	`+erasedHaveIntersection(t1,t2)`
	`1277`	`+}`
	`1278`	`+`
`1272`	`1279`	`/**`
`1273`	`1280`	`* Holds if there is no common (reflexive, transitive) subtype of the erasures`
`1274`	`1281`	* of types `t1` and `t2`.

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,8 @@ class MismatchedContainerAccess extends MethodCall {`
`103`	`103`	`\|`
`104`	`104`	`this.getCallee()`
`105`	`105`	`.getDeclaringType()`
`106`		`- .getASourceSupertype*()`
`107`	`106`	`.getSourceDeclaration()`
	`107`	`+ .getASourceSupertype*()`
`108`	`108`	`.hasQualifiedName(package,type)and`
`109`	`109`	`this.getCallee().getParameter(i).getType()instanceofTypeObject`
`110`	`110`	`)`
`@@ -119,7 +119,7 @@ class MismatchedContainerAccess extends MethodCall {`
`119`	`119`	`containerAccess(package,type,p,this.getCallee().getSignature(),i)`
`120`	`120`	`\|`
`121`	`121`	`t=this.getCallee().getDeclaringType()and`
`122`		`-t.getASourceSupertype*().getSourceDeclaration()=gand`
	`122`	`+t.getSourceDeclaration().getASourceSupertype*()=gand`
`123`	`123`	`g.hasQualifiedName(package,type)and`
`124`	`124`	`indirectlyInstantiates(t,g,p,result)`
`125`	`125`	`)`

Comments

(0)