Skip to content

Commit 95d7d59

Browse files
geo2ageo2a
authored
Increase depth and emit a trace when pruning vacuous branches in Proxy.hs (#3974)
Fixes #3973
1 parent 561a538 commit 95d7d59

File tree

3 files changed

+185
-46
lines changed

3 files changed

+185
-46
lines changed

‎booster/test/rpc-integration/test-issue3764-vacuous-branch/response-branch-after-one.json

Lines changed: 66 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,69 @@
5858
]
5959
},
6060
{
61-
"tag": "EVar",
62-
"name": "VarCONTINUATION",
63-
"sort": {
64-
"tag": "SortApp",
65-
"name": "SortK",
66-
"args": []
67-
}
61+
"tag": "App",
62+
"name": "kseq",
63+
"sorts": [],
64+
"args": [
65+
{
66+
"tag": "App",
67+
"name": "inj",
68+
"sorts": [
69+
{
70+
"tag": "SortApp",
71+
"name": "SortInternalOp",
72+
"args": []
73+
},
74+
{
75+
"tag": "SortApp",
76+
"name": "SortKItem",
77+
"args": []
78+
}
79+
],
80+
"args": [
81+
{
82+
"tag": "App",
83+
"name": "Lbl'Hash'pc'LSqBUndsRSqBUnds'EVM'Unds'InternalOp'Unds'OpCode",
84+
"sorts": [],
85+
"args": [
86+
{
87+
"tag": "App",
88+
"name": "inj",
89+
"sorts": [
90+
{
91+
"tag": "SortApp",
92+
"name": "SortBinStackOp",
93+
"args": []
94+
},
95+
{
96+
"tag": "SortApp",
97+
"name": "SortOpCode",
98+
"args": []
99+
}
100+
],
101+
"args": [
102+
{
103+
"tag": "App",
104+
"name": "LblJUMPI'Unds'EVM'Unds'BinStackOp",
105+
"sorts": [],
106+
"args": []
107+
}
108+
]
109+
}
110+
]
111+
}
112+
]
113+
},
114+
{
115+
"tag": "EVar",
116+
"name": "VarCONTINUATION",
117+
"sort": {
118+
"tag": "SortApp",
119+
"name": "SortK",
120+
"args": []
121+
}
122+
}
123+
]
68124
}
69125
]
70126
}
@@ -8757,18 +8813,18 @@
87578813
},
87588814
{
87598815
"tag": "rewrite",
8760-
"origin": "booster",
8816+
"origin": "proxy",
87618817
"result": {
87628818
"tag": "success",
8763-
"rule-id": "20bc9774d59030dcada92e997351315ed198a464546f5b36d67578cfd12938d1"
8819+
"rule-id": "0ee7a2c1d6ff36a91ac9e9ed19a2c624ba21b97f4511af22044f6169bb8adfa1"
87648820
}
87658821
},
87668822
{
87678823
"tag": "rewrite",
87688824
"origin": "booster",
87698825
"result": {
87708826
"tag": "success",
8771-
"rule-id": "d40db55be13c107a708382df2ae9cea0d6305bbf5d6804de46250d7076a392e2"
8827+
"rule-id": "20bc9774d59030dcada92e997351315ed198a464546f5b36d67578cfd12938d1"
87728828
}
87738829
}
87748830
]

‎booster/test/rpc-integration/test-issue3764-vacuous-branch/response-branch-in-zero.json

Lines changed: 66 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,69 @@
5858
]
5959
},
6060
{
61-
"tag": "EVar",
62-
"name": "VarCONTINUATION",
63-
"sort": {
64-
"tag": "SortApp",
65-
"name": "SortK",
66-
"args": []
67-
}
61+
"tag": "App",
62+
"name": "kseq",
63+
"sorts": [],
64+
"args": [
65+
{
66+
"tag": "App",
67+
"name": "inj",
68+
"sorts": [
69+
{
70+
"tag": "SortApp",
71+
"name": "SortInternalOp",
72+
"args": []
73+
},
74+
{
75+
"tag": "SortApp",
76+
"name": "SortKItem",
77+
"args": []
78+
}
79+
],
80+
"args": [
81+
{
82+
"tag": "App",
83+
"name": "Lbl'Hash'pc'LSqBUndsRSqBUnds'EVM'Unds'InternalOp'Unds'OpCode",
84+
"sorts": [],
85+
"args": [
86+
{
87+
"tag": "App",
88+
"name": "inj",
89+
"sorts": [
90+
{
91+
"tag": "SortApp",
92+
"name": "SortBinStackOp",
93+
"args": []
94+
},
95+
{
96+
"tag": "SortApp",
97+
"name": "SortOpCode",
98+
"args": []
99+
}
100+
],
101+
"args": [
102+
{
103+
"tag": "App",
104+
"name": "LblJUMPI'Unds'EVM'Unds'BinStackOp",
105+
"sorts": [],
106+
"args": []
107+
}
108+
]
109+
}
110+
]
111+
}
112+
]
113+
},
114+
{
115+
"tag": "EVar",
116+
"name": "VarCONTINUATION",
117+
"sort": {
118+
"tag": "SortApp",
119+
"name": "SortK",
120+
"args": []
121+
}
122+
}
123+
]
68124
}
69125
]
70126
}
@@ -8749,18 +8805,18 @@
87498805
"logs": [
87508806
{
87518807
"tag": "rewrite",
8752-
"origin": "booster",
8808+
"origin": "proxy",
87538809
"result": {
87548810
"tag": "success",
8755-
"rule-id": "20bc9774d59030dcada92e997351315ed198a464546f5b36d67578cfd12938d1"
8811+
"rule-id": "0ee7a2c1d6ff36a91ac9e9ed19a2c624ba21b97f4511af22044f6169bb8adfa1"
87568812
}
87578813
},
87588814
{
87598815
"tag": "rewrite",
87608816
"origin": "booster",
87618817
"result": {
87628818
"tag": "success",
8763-
"rule-id": "d40db55be13c107a708382df2ae9cea0d6305bbf5d6804de46250d7076a392e2"
8819+
"rule-id": "20bc9774d59030dcada92e997351315ed198a464546f5b36d67578cfd12938d1"
87648820
}
87658821
}
87668822
]

0 commit comments

Comments
 (0)