Skip to content

Commit 4cd4fd2

Browse files
Explicitly blacklist all predefined bv functions as variable/uf names.
Not allowing any variable names starting with "bv" lead to too many issues as the prefix is used frequently throughout the tests.
1 parent e767a9f commit 4cd4fd2

File tree

1 file changed

+28
-3
lines changed

1 file changed

+28
-3
lines changed

src/org/sosy_lab/java_smt/basicimpl/AbstractFormulaManager.java

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,34 @@ public abstract class AbstractFormulaManager<TFormulaInfo, TType, TEnv, TFuncDec
112112
// Bitvectors
113113
"concat",
114114
"extract",
115-
// + any symbol starting with "bv"
115+
"zero_extend",
116+
"sign_extend",
117+
"rotate_left",
118+
"rotate_right",
119+
"bv2int",
120+
"int2bv",
121+
"bvadd",
122+
"bvsub",
116123
"bvneg",
124+
"bvmul",
125+
"bvurem",
126+
"bvsrem",
127+
"bvsmod",
128+
"bvshl",
129+
"bvlshr",
130+
"bvashr",
131+
"bvor",
132+
"bvand",
133+
"bvnot",
134+
"bvxor",
135+
"bvule",
136+
"bvult",
137+
"bvuge",
138+
"bvugt",
139+
"bvsle",
140+
"bvslt",
141+
"bvsge",
142+
"bvsgt",
117143

118144
// Core
119145
"true",
@@ -181,8 +207,7 @@ public abstract class AbstractFormulaManager<TFormulaInfo, TType, TEnv, TFuncDec
181207
* solvers.
182208
*/
183209
public static boolean isReserved(String pVar) {
184-
return pVar.startsWith("bv")
185-
|| pVar.startsWith("fp.*")
210+
return pVar.startsWith("fp.")
186211
|| pVar.startsWith("str.")
187212
|| pVar.startsWith("re.")
188213
|| RESERVED.contains(pVar);

0 commit comments

Comments
 (0)