@@ -1644,7 +1644,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
1644
1644
/** A synthesized SSA data flow node. */
1645
1645
abstract private class SsaNodeImpl extends NodeImpl {
1646
1646
/** Gets the underlying SSA definition. */
1647
- abstract DefinitionExt getDefinitionExt ( ) ;
1647
+ abstract deprecated DefinitionExt getDefinitionExt ( ) ;
1648
1648
1649
1649
/** Gets the SSA definition this node corresponds to, if any. */
1650
1650
Definition asDefinition ( ) { this = TSsaDefinitionNode ( result ) }
@@ -1664,7 +1664,9 @@ module Make<LocationSig Location, InputSig<Location> Input> {
1664
1664
1665
1665
SsaDefinitionExtNodeImpl ( ) { this = TSsaDefinitionNode ( def ) }
1666
1666
1667
- override DefinitionExt getDefinitionExt ( ) { result = def }
1667
+ DefinitionExt getDefExt ( ) { result = def }
1668
+
1669
+ deprecated override DefinitionExt getDefinitionExt ( ) { result = def }
1668
1670
1669
1671
override BasicBlock getBasicBlock ( ) { result = def .getBasicBlock ( ) }
1670
1672
@@ -1692,7 +1694,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
1692
1694
/** A node that represents a synthetic read of a source variable. */
1693
1695
final class SsaSynthReadNode extends SsaNode {
1694
1696
SsaSynthReadNode ( ) {
1695
- this .( SsaDefinitionExtNodeImpl ) .getDefinitionExt ( ) instanceof PhiReadNode or
1697
+ this .( SsaDefinitionExtNodeImpl ) .getDefExt ( ) instanceof PhiReadNode or
1696
1698
this instanceof SsaInputNodeImpl
1697
1699
}
1698
1700
}
@@ -1744,7 +1746,9 @@ module Make<LocationSig Location, InputSig<Location> Input> {
1744
1746
input = input_
1745
1747
}
1746
1748
1747
- override SsaInputDefinitionExt getDefinitionExt ( ) { result = def_ }
1749
+ SsaInputDefinitionExt getPhi ( ) { result = def_ }
1750
+
1751
+ deprecated override SsaInputDefinitionExt getDefinitionExt ( ) { result = def_ }
1748
1752
1749
1753
override BasicBlock getBasicBlock ( ) { result = input_ }
1750
1754
@@ -1767,7 +1771,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
1767
1771
private predicate flowOutOf (
1768
1772
DefinitionExt def , Node nodeFrom , SourceVariable v , BasicBlock bb , int i , boolean isUseStep
1769
1773
) {
1770
- nodeFrom .( SsaDefinitionExtNodeImpl ) .getDefinitionExt ( ) = def and
1774
+ nodeFrom .( SsaDefinitionExtNodeImpl ) .getDefExt ( ) = def and
1771
1775
def .definesAt ( v , bb , i , _) and
1772
1776
isUseStep = false
1773
1777
or
@@ -1790,7 +1794,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
1790
1794
// Flow from parameter into entry definition
1791
1795
DfInput:: ssaDefInitializesParam ( def , nodeFrom .( ParameterNode ) .getParameter ( ) )
1792
1796
) and
1793
- nodeTo .( SsaDefinitionExtNodeImpl ) .getDefinitionExt ( ) = def and
1797
+ nodeTo .( SsaDefinitionExtNodeImpl ) .getDefExt ( ) = def and
1794
1798
isUseStep = false
1795
1799
or
1796
1800
// Flow from definition/read to next read
@@ -1806,7 +1810,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
1806
1810
AdjacentSsaRefs:: adjacentRefRead ( bb1 , i1 , bb2 , i2 , v ) and
1807
1811
exists ( UncertainWriteDefinition def2 |
1808
1812
DfInput:: allowFlowIntoUncertainDef ( def2 ) and
1809
- nodeTo .( SsaDefinitionExtNodeImpl ) .getDefinitionExt ( ) = def2 and
1813
+ nodeTo .( SsaDefinitionExtNodeImpl ) .getDefExt ( ) = def2 and
1810
1814
def2 .definesAt ( v , bb2 , i2 )
1811
1815
)
1812
1816
)
@@ -1823,8 +1827,8 @@ module Make<LocationSig Location, InputSig<Location> Input> {
1823
1827
)
1824
1828
or
1825
1829
// Flow from input node to def
1826
- nodeTo .( SsaDefinitionExtNodeImpl ) .getDefinitionExt ( ) = def and
1827
- def = nodeFrom .( SsaInputNodeImpl ) .getDefinitionExt ( ) and
1830
+ nodeTo .( SsaDefinitionExtNodeImpl ) .getDefExt ( ) = def and
1831
+ def = nodeFrom .( SsaInputNodeImpl ) .getPhi ( ) and
1828
1832
isUseStep = false
1829
1833
}
1830
1834
@@ -1837,10 +1841,10 @@ module Make<LocationSig Location, InputSig<Location> Input> {
1837
1841
// Flow from parameter into entry definition
1838
1842
DfInput:: ssaDefInitializesParam ( def , nodeFrom .( ParameterNode ) .getParameter ( ) )
1839
1843
) and
1840
- nodeTo .( SsaDefinitionExtNodeImpl ) .getDefinitionExt ( ) = def
1844
+ nodeTo .( SsaDefinitionExtNodeImpl ) .getDefExt ( ) = def
1841
1845
or
1842
1846
// Flow from SSA definition to read
1843
- nodeFrom .( SsaDefinitionExtNodeImpl ) .getDefinitionExt ( ) = def and
1847
+ nodeFrom .( SsaDefinitionExtNodeImpl ) .getDefExt ( ) = def and
1844
1848
nodeTo .( ExprNode ) .getExpr ( ) = DfInput:: getARead ( def )
1845
1849
}
1846
1850
0 commit comments