Skip to content

Commit 466b88c

Browse files
slissonslisson
committed
Revert "Shadow: Optimisation for properties that reduces invalidations"
This reverts commit 6847d3f. See slisson/shadowmodels#142 and slisson/shadowmodels#143
1 parent cc5780e commit 466b88c

File tree

3 files changed

+88
-364
lines changed

3 files changed

+88
-364
lines changed

‎code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/generator/template/[email protected]‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
77
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
88
<use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="-1" />
9-
<use id="94b64715-a263-4c36-a138-8da14705ffa7" name="de.q60.mps.shadowmodels.transformation" version="1" />
9+
<use id="94b64715-a263-4c36-a138-8da14705ffa7" name="de.q60.mps.shadowmodels.transformation" version="-1" />
1010
<devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
1111
</languages>
1212
<imports>
@@ -6590,7 +6590,7 @@
65906590
</node>
65916591
</node>
65926592
<node concept="liA8E" id="4EhVFrZahta" role="2OqNvi">
6593-
<ref role="37wK5l" to="nv3w:4k1tkzD8nbK" resolve="setProperty" />
6593+
<ref role="37wK5l" to="nv3w:5gTrVpGiOCu" resolve="setProperty" />
65946594
<node concept="Xl_RD" id="4EhVFrZahYi" role="37wK5m">
65956595
<property role="Xl_RC" value="role" />
65966596
<node concept="17Uvod" id="4EhVFrZahYj" role="lGtFl">
@@ -6615,27 +6615,17 @@
66156615
</node>
66166616
</node>
66176617
</node>
6618-
<node concept="1bVj0M" id="4k1tkzDb6NW" role="37wK5m">
6619-
<node concept="3clFbS" id="4k1tkzDb6NY" role="1bW5cS">
6620-
<node concept="3clFbF" id="4k1tkzDb7zt" role="3cqZAp">
6621-
<node concept="2YIFZM" id="4k1tkzDd$1_" role="3clFbG">
6622-
<ref role="37wK5l" to="l6bp:4k1tkzDdwaK" resolve="asString" />
6623-
<ref role="1Pybhc" to="l6bp:7NImM04Z3QF" resolve="ParameterConversion" />
6624-
<node concept="Xl_RD" id="4k1tkzDb7zv" role="37wK5m">
6625-
<property role="Xl_RC" value="value" />
6626-
<node concept="29HgVG" id="4k1tkzDb7zw" role="lGtFl">
6627-
<node concept="3NFfHV" id="4k1tkzDb7zx" role="3NFExx">
6628-
<node concept="3clFbS" id="4k1tkzDb7zy" role="2VODD2">
6629-
<node concept="3clFbF" id="4k1tkzDb7zz" role="3cqZAp">
6630-
<node concept="2OqwBi" id="4k1tkzDb7z$" role="3clFbG">
6631-
<node concept="3TrEf2" id="4k1tkzDb7z_" role="2OqNvi">
6632-
<ref role="3Tt5mk" to="oyp0:6ndA7L_LuTN" resolve="value" />
6633-
</node>
6634-
<node concept="30H73N" id="4k1tkzDb7zA" role="2Oq$k0" />
6635-
</node>
6636-
</node>
6637-
</node>
6618+
<node concept="Xl_RD" id="4EhVFrZaj84" role="37wK5m">
6619+
<property role="Xl_RC" value="value" />
6620+
<node concept="29HgVG" id="4EhVFrZaluZ" role="lGtFl">
6621+
<node concept="3NFfHV" id="4EhVFrZalv0" role="3NFExx">
6622+
<node concept="3clFbS" id="4EhVFrZalv1" role="2VODD2">
6623+
<node concept="3clFbF" id="4EhVFrZalv7" role="3cqZAp">
6624+
<node concept="2OqwBi" id="4EhVFrZalv2" role="3clFbG">
6625+
<node concept="3TrEf2" id="4EhVFrZalv5" role="2OqNvi">
6626+
<ref role="3Tt5mk" to="oyp0:6ndA7L_LuTN" resolve="value" />
66386627
</node>
6628+
<node concept="30H73N" id="4EhVFrZalv6" role="2Oq$k0" />
66396629
</node>
66406630
</node>
66416631
</node>

‎code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/engine.mps‎

Lines changed: 60 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1807,16 +1807,12 @@
18071807
<node concept="3Tm6S6" id="5gTrVpGiHTC" role="1B3o_S" />
18081808
<node concept="3rvAFt" id="5gTrVpGiHTU" role="1tU5fm">
18091809
<node concept="17QB3L" id="5gTrVpGiHUg" role="3rvQeY" />
1810-
<node concept="1ajhzC" id="4k1tkzD83aV" role="3rvSg0">
1811-
<node concept="17QB3L" id="4k1tkzD84D_" role="1ajl9A" />
1812-
</node>
1810+
<node concept="17QB3L" id="5gTrVpGiHUw" role="3rvSg0" />
18131811
</node>
18141812
<node concept="2ShNRf" id="5gTrVpGiHW8" role="33vP2m">
18151813
<node concept="3rGOSV" id="5gTrVpGiHVA" role="2ShVmc">
18161814
<node concept="17QB3L" id="5gTrVpGiHVB" role="3rHrn6" />
1817-
<node concept="1ajhzC" id="4k1tkzD868R" role="3rHtpV">
1818-
<node concept="17QB3L" id="4k1tkzD87BZ" role="1ajl9A" />
1819-
</node>
1815+
<node concept="17QB3L" id="5gTrVpGiHVC" role="3rHtpV" />
18201816
</node>
18211817
</node>
18221818
</node>
@@ -2160,36 +2156,13 @@
21602156
<node concept="17QB3L" id="42zqTR3q5BW" role="3clF45" />
21612157
<node concept="3Tm1VV" id="42zqTR3pYhg" role="1B3o_S" />
21622158
<node concept="3clFbS" id="42zqTR3pYhh" role="3clF47">
2163-
<node concept="3cpWs8" id="4k1tkzD8hkK" role="3cqZAp">
2164-
<node concept="3cpWsn" id="4k1tkzD8hkL" role="3cpWs9">
2165-
<property role="TrG5h" value="p" />
2166-
<node concept="1ajhzC" id="4k1tkzD8hkv" role="1tU5fm">
2167-
<node concept="17QB3L" id="4k1tkzD8hky" role="1ajl9A" />
2168-
</node>
2169-
<node concept="3EllGN" id="4k1tkzD8hkM" role="33vP2m">
2170-
<node concept="37vLTw" id="4k1tkzD8hkN" role="3ElVtu">
2171-
<ref role="3cqZAo" node="42zqTR3q8Tq" resolve="role" />
2172-
</node>
2173-
<node concept="37vLTw" id="4k1tkzD8hkO" role="3ElQJh">
2174-
<ref role="3cqZAo" node="5gTrVpGiHTB" resolve="propertyValues" />
2175-
</node>
2176-
</node>
2177-
</node>
2178-
</node>
21792159
<node concept="3clFbF" id="42zqTR3q8fg" role="3cqZAp">
2180-
<node concept="3K4zz7" id="4k1tkzD8jbt" role="3clFbG">
2181-
<node concept="10Nm6u" id="4k1tkzD8jgf" role="3K4E3e" />
2182-
<node concept="3clFbC" id="4k1tkzD8iXz" role="3K4Cdx">
2183-
<node concept="10Nm6u" id="4k1tkzD8j2a" role="3uHU7w" />
2184-
<node concept="37vLTw" id="4k1tkzD8iX8" role="3uHU7B">
2185-
<ref role="3cqZAo" node="4k1tkzD8hkL" resolve="p" />
2186-
</node>
2160+
<node concept="3EllGN" id="42zqTR3q8HJ" role="3clFbG">
2161+
<node concept="37vLTw" id="42zqTR3qbMm" role="3ElVtu">
2162+
<ref role="3cqZAo" node="42zqTR3q8Tq" resolve="role" />
21872163
</node>
2188-
<node concept="2OqwBi" id="4k1tkzD892r" role="3K4GZi">
2189-
<node concept="37vLTw" id="4k1tkzD8hkP" role="2Oq$k0">
2190-
<ref role="3cqZAo" node="4k1tkzD8hkL" resolve="p" />
2191-
</node>
2192-
<node concept="1Bd96e" id="4k1tkzD8hdD" role="2OqNvi" />
2164+
<node concept="37vLTw" id="42zqTR3q8ff" role="3ElQJh">
2165+
<ref role="3cqZAo" node="5gTrVpGiHTB" resolve="propertyValues" />
21932166
</node>
21942167
</node>
21952168
</node>
@@ -3267,58 +3240,21 @@
32673240
<node concept="3cqZAl" id="5gTrVpGiOCz" role="3clF45" />
32683241
<node concept="3Tm1VV" id="5gTrVpGiOC$" role="1B3o_S" />
32693242
<node concept="3clFbS" id="5gTrVpGiOCA" role="3clF47">
3270-
<node concept="3clFbF" id="4k1tkzD8$kc" role="3cqZAp">
3271-
<node concept="1rXfSq" id="4k1tkzD8$kb" role="3clFbG">
3272-
<ref role="37wK5l" node="4k1tkzD8nbK" resolve="setProperty" />
3273-
<node concept="37vLTw" id="4k1tkzD8B6T" role="37wK5m">
3274-
<ref role="3cqZAo" node="5gTrVpGiOCv" resolve="role" />
3275-
</node>
3276-
<node concept="1bVj0M" id="4k1tkzD8CsR" role="37wK5m">
3277-
<node concept="3clFbS" id="4k1tkzD8CsT" role="1bW5cS">
3278-
<node concept="3clFbF" id="4k1tkzD8CJ6" role="3cqZAp">
3279-
<node concept="37vLTw" id="4k1tkzD8CJ5" role="3clFbG">
3280-
<ref role="3cqZAo" node="5gTrVpGiOCx" resolve="value" />
3281-
</node>
3282-
</node>
3283-
</node>
3284-
</node>
3285-
</node>
3286-
</node>
3287-
</node>
3288-
</node>
3289-
<node concept="2tJIrI" id="4k1tkzD8Fln" role="jymVt" />
3290-
<node concept="3clFb_" id="4k1tkzD8nbK" role="jymVt">
3291-
<property role="1EzhhJ" value="false" />
3292-
<property role="TrG5h" value="setProperty" />
3293-
<node concept="37vLTG" id="4k1tkzD8nbL" role="3clF46">
3294-
<property role="TrG5h" value="role" />
3295-
<node concept="17QB3L" id="4k1tkzD8nbM" role="1tU5fm" />
3296-
</node>
3297-
<node concept="37vLTG" id="4k1tkzD8nbN" role="3clF46">
3298-
<property role="TrG5h" value="value" />
3299-
<property role="3TUv4t" value="true" />
3300-
<node concept="1ajhzC" id="4k1tkzD8u9S" role="1tU5fm">
3301-
<node concept="17QB3L" id="4k1tkzD8us9" role="1ajl9A" />
3302-
</node>
3303-
</node>
3304-
<node concept="3cqZAl" id="4k1tkzD8nbP" role="3clF45" />
3305-
<node concept="3Tm1VV" id="4k1tkzD8nbQ" role="1B3o_S" />
3306-
<node concept="3clFbS" id="4k1tkzD8nbR" role="3clF47">
3307-
<node concept="3clFbF" id="4k1tkzD8nbS" role="3cqZAp">
3308-
<node concept="1rXfSq" id="4k1tkzD8nbT" role="3clFbG">
3243+
<node concept="3clFbF" id="3kkgokhyoDj" role="3cqZAp">
3244+
<node concept="1rXfSq" id="3kkgokhyoDk" role="3clFbG">
33093245
<ref role="37wK5l" node="3kkgokhxPMf" resolve="checkNotFrozen" />
33103246
</node>
33113247
</node>
3312-
<node concept="3clFbF" id="4k1tkzD8nbU" role="3cqZAp">
3313-
<node concept="37vLTI" id="4k1tkzD8nbV" role="3clFbG">
3314-
<node concept="37vLTw" id="4k1tkzD8xlz" role="37vLTx">
3315-
<ref role="3cqZAo" node="4k1tkzD8nbN" resolve="value" />
3248+
<node concept="3clFbF" id="5gTrVpGiQss" role="3cqZAp">
3249+
<node concept="37vLTI" id="5gTrVpGiSKO" role="3clFbG">
3250+
<node concept="37vLTw" id="5gTrVpGiSRN" role="37vLTx">
3251+
<ref role="3cqZAo" node="5gTrVpGiOCx" resolve="value" />
33163252
</node>
3317-
<node concept="3EllGN" id="4k1tkzD8nc0" role="37vLTJ">
3318-
<node concept="37vLTw" id="4k1tkzD8nc1" role="3ElVtu">
3319-
<ref role="3cqZAo" node="4k1tkzD8nbL" resolve="role" />
3253+
<node concept="3EllGN" id="5gTrVpGiQQy" role="37vLTJ">
3254+
<node concept="37vLTw" id="5gTrVpGiSqg" role="3ElVtu">
3255+
<ref role="3cqZAo" node="5gTrVpGiOCv" resolve="role" />
33203256
</node>
3321-
<node concept="37vLTw" id="4k1tkzD8nc2" role="3ElQJh">
3257+
<node concept="37vLTw" id="5gTrVpGiQsr" role="3ElQJh">
33223258
<ref role="3cqZAo" node="5gTrVpGiHTB" resolve="propertyValues" />
33233259
</node>
33243260
</node>
@@ -15247,39 +15183,52 @@
1524715183
</node>
1524815184
</node>
1524915185
<node concept="3clFbS" id="2ePp5XuPdMR" role="2LFqv$">
15250-
<node concept="3clFbF" id="4wrAhqcM$yo" role="3cqZAp">
15251-
<node concept="1rXfSq" id="4wrAhqcM$ym" role="3clFbG">
15252-
<ref role="37wK5l" node="4wrAhqcMrW2" resolve="setProperty" />
15253-
<node concept="37vLTw" id="4wrAhqcM$EQ" role="37wK5m">
15254-
<ref role="3cqZAo" node="2ePp5XuPdA5" resolve="copy" />
15255-
</node>
15256-
<node concept="2GrUjf" id="4wrAhqcM$JT" role="37wK5m">
15257-
<ref role="2Gs0qQ" node="2ePp5XuPdML" resolve="property" />
15258-
</node>
15259-
<node concept="1bVj0M" id="4k1tkzDacDr" role="37wK5m">
15260-
<node concept="3clFbS" id="4k1tkzDacDt" role="1bW5cS">
15261-
<node concept="3clFbF" id="4k1tkzDacSQ" role="3cqZAp">
15262-
<node concept="2OqwBi" id="4k1tkzDacSS" role="3clFbG">
15263-
<node concept="37vLTw" id="4k1tkzDacST" role="2Oq$k0">
15264-
<ref role="3cqZAo" node="2ePp5XuPfsA" resolve="source" />
15265-
</node>
15266-
<node concept="liA8E" id="4k1tkzDacSU" role="2OqNvi">
15267-
<ref role="37wK5l" to="mjcn:5gTrVpGiT$g" resolve="getPropertyValue" />
15268-
<node concept="2OqwBi" id="4k1tkzDacSV" role="37wK5m">
15269-
<node concept="2GrUjf" id="4k1tkzDacSW" role="2Oq$k0">
15270-
<ref role="2Gs0qQ" node="2ePp5XuPdML" resolve="property" />
15271-
</node>
15272-
<node concept="liA8E" id="4k1tkzDacSX" role="2OqNvi">
15273-
<ref role="37wK5l" to="mjcn:2ePp5XuOLmt" resolve="getName" />
15274-
</node>
15275-
</node>
15276-
</node>
15186+
<node concept="3cpWs8" id="2ePp5XuPdMS" role="3cqZAp">
15187+
<node concept="3cpWsn" id="2ePp5XuPdMT" role="3cpWs9">
15188+
<property role="TrG5h" value="value" />
15189+
<node concept="17QB3L" id="2ePp5XuPdMU" role="1tU5fm" />
15190+
<node concept="2OqwBi" id="2ePp5XuPdMV" role="33vP2m">
15191+
<node concept="37vLTw" id="2ePp5XuPdMW" role="2Oq$k0">
15192+
<ref role="3cqZAo" node="2ePp5XuPfsA" resolve="source" />
15193+
</node>
15194+
<node concept="liA8E" id="2ePp5XuPdMX" role="2OqNvi">
15195+
<ref role="37wK5l" to="mjcn:5gTrVpGiT$g" resolve="getPropertyValue" />
15196+
<node concept="2OqwBi" id="2ePp5XuPdMY" role="37wK5m">
15197+
<node concept="2GrUjf" id="2ePp5XuPdMZ" role="2Oq$k0">
15198+
<ref role="2Gs0qQ" node="2ePp5XuPdML" resolve="property" />
15199+
</node>
15200+
<node concept="liA8E" id="2ePp5XuPdN0" role="2OqNvi">
15201+
<ref role="37wK5l" to="mjcn:2ePp5XuOLmt" resolve="getName" />
1527715202
</node>
1527815203
</node>
1527915204
</node>
1528015205
</node>
1528115206
</node>
1528215207
</node>
15208+
<node concept="3clFbJ" id="2ePp5XuPdN1" role="3cqZAp">
15209+
<node concept="3clFbS" id="2ePp5XuPdN2" role="3clFbx">
15210+
<node concept="3clFbF" id="4wrAhqcM$yo" role="3cqZAp">
15211+
<node concept="1rXfSq" id="4wrAhqcM$ym" role="3clFbG">
15212+
<ref role="37wK5l" node="4wrAhqcMrW2" resolve="setProperty" />
15213+
<node concept="37vLTw" id="4wrAhqcM$EQ" role="37wK5m">
15214+
<ref role="3cqZAo" node="2ePp5XuPdA5" resolve="copy" />
15215+
</node>
15216+
<node concept="2GrUjf" id="4wrAhqcM$JT" role="37wK5m">
15217+
<ref role="2Gs0qQ" node="2ePp5XuPdML" resolve="property" />
15218+
</node>
15219+
<node concept="37vLTw" id="4wrAhqcM_6y" role="37wK5m">
15220+
<ref role="3cqZAo" node="2ePp5XuPdMT" resolve="value" />
15221+
</node>
15222+
</node>
15223+
</node>
15224+
</node>
15225+
<node concept="3y3z36" id="2ePp5XuPdNb" role="3clFbw">
15226+
<node concept="10Nm6u" id="2ePp5XuPdNc" role="3uHU7w" />
15227+
<node concept="37vLTw" id="2ePp5XuPdNd" role="3uHU7B">
15228+
<ref role="3cqZAo" node="2ePp5XuPdMT" resolve="value" />
15229+
</node>
15230+
</node>
15231+
</node>
1528315232
<node concept="3clFbF" id="3ECE8iPFlrT" role="3cqZAp">
1528415233
<node concept="2OqwBi" id="3ECE8iPFl$1" role="3clFbG">
1528515234
<node concept="37vLTw" id="3ECE8iPFlrR" role="2Oq$k0">
@@ -15696,9 +15645,7 @@
1569615645
</node>
1569715646
<node concept="37vLTG" id="4wrAhqcMyAa" role="3clF46">
1569815647
<property role="TrG5h" value="value" />
15699-
<node concept="1ajhzC" id="4k1tkzD8LxW" role="1tU5fm">
15700-
<node concept="17QB3L" id="4k1tkzD8LUV" role="1ajl9A" />
15701-
</node>
15648+
<node concept="17QB3L" id="4wrAhqcMzCe" role="1tU5fm" />
1570215649
</node>
1570315650
<node concept="3cqZAl" id="4wrAhqcMrW4" role="3clF45" />
1570415651
<node concept="3Tm1VV" id="4wrAhqcMrW5" role="1B3o_S" />
@@ -15709,7 +15656,7 @@
1570915656
<ref role="3cqZAo" node="4wrAhqcMvVm" resolve="node" />
1571015657
</node>
1571115658
<node concept="liA8E" id="4wrAhqcMzKu" role="2OqNvi">
15712-
<ref role="37wK5l" node="4k1tkzD8nbK" resolve="setProperty" />
15659+
<ref role="37wK5l" node="5gTrVpGiOCu" resolve="setProperty" />
1571315660
<node concept="2OqwBi" id="4wrAhqcMzKv" role="37wK5m">
1571415661
<node concept="37vLTw" id="4wrAhqcM$7R" role="2Oq$k0">
1571515662
<ref role="3cqZAo" node="4wrAhqcMxq_" resolve="property" />
@@ -33951,13 +33898,13 @@
3395133898
<property role="3GE5qa" value="call.context" />
3395233899
<property role="TrG5h" value="LazyContext" />
3395333900
<node concept="2tJIrI" id="3kkgokkkU8k" role="jymVt" />
33901+
<node concept="3Tm1VV" id="3kkgokkkU8q" role="1B3o_S" />
3395433902
<node concept="312cEg" id="2BHSBiu7uhW" role="jymVt">
3395533903
<property role="TrG5h" value="traceInfo" />
3395633904
<node concept="3Tm6S6" id="2BHSBiu7uhX" role="1B3o_S" />
3395733905
<node concept="17QB3L" id="2BHSBiu7vkU" role="1tU5fm" />
3395833906
</node>
3395933907
<node concept="2tJIrI" id="2BHSBiu7scG" role="jymVt" />
33960-
<node concept="3Tm1VV" id="3kkgokkkU8q" role="1B3o_S" />
3396133908
<node concept="3clFbW" id="3kkgokkkU8r" role="jymVt">
3396233909
<node concept="3cqZAl" id="3kkgokkkU8s" role="3clF45" />
3396333910
<node concept="3Tm1VV" id="3kkgokkkU8t" role="1B3o_S" />

0 commit comments

Comments
 (0)