Commit 70e935db5b

Andrew Kelley <andrew@ziglang.org>
2021-02-26 05:27:56
translate-c: fix botched merge conflict
Previous commit failed to correctly solve the translate-c merge conflict; this commit fixes it.
master
1 parent 0b58b61
Changed files (1)
src
translate_c.zig
src/translate_c.zig
@@ -2449,8 +2449,8 @@ fn transSwitchProngStmtInline(
 
 fn transConstantExpr(c: *Context, scope: *Scope, expr: *const clang.Expr, used: ResultUsed) TransError!Node {
     var result: clang.ExprEvalResult = undefined;
-    if (!expr.evaluateAsConstantExpr(&result, .Normal, rp.c.clang_context))
-        return revertAndWarn(rp, error.UnsupportedTranslation, expr.getBeginLoc(), "invalid constant expression", .{});
+    if (!expr.evaluateAsConstantExpr(&result, .Normal, c.clang_context))
+        return fail(c, error.UnsupportedTranslation, expr.getBeginLoc(), "invalid constant expression", .{});
 
     switch (result.Val.getKind()) {
         .Int => {