zig

commit 70e935db5bc16e5a7144dd0de3176d53dd892301 (tree)
parent 0b58b617998b79a765b54f88fbe90ca2798b3d3e
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Thu, 25 Feb 2021 21:27:56 -0700

translate-c: fix botched merge conflict

Previous commit failed to correctly solve the translate-c merge
conflict; this commit fixes it.

Diffstat:
M
src/translate_c.zig
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/translate_c.zig b/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 => {