Merge pull request #133 from google/cpp-sync

OSS export

Author: kyessenov

bazel/deps.bzl

@@ -7,9 +7,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 def base_deps():
     """Base evaluator and test dependencies."""
 
-    # LTS, March 2021, Patch 2
-    ABSL_SHA1 = "278e0a071885a22dcd2fd1b5576cc44757299343"
-    ABSL_SHA256 = "ff5ea6f91f9bcd0f368346ef707d0a80a372b71de5b6ae69ac11d0ca41688b8f"
+    # 2021-10-05
+    ABSL_SHA1 = "b9b925341f9e90f5e7aa0cf23f036c29c7e454eb"
+    ABSL_SHA256 = "bb2a0b57c92b6666e8acb00f4cbbfce6ddb87e83625fb851b0e78db581340617"
     http_archive(
         name = "com_google_absl",
         urls = ["https://github.com/abseil/abseil-cpp/archive/" + ABSL_SHA1 + ".zip"],

eval/public/ast_traverse.cc

@@ -59,20 +59,25 @@ struct StackRecord {
   static constexpr int kNotCallArg = -1;
   static constexpr int kTarget = -2;
 
-  StackRecord(const Expr* e, const SourceInfo* info)
-      : record_variant(ExprRecord{.expr = e, .source_info = info}),
-        visited(false) {}
+  StackRecord(const Expr* e, const SourceInfo* info) {
+    ExprRecord record;
+    record.expr = e;
+    record.source_info = info;
+    record_variant = record;
+  }
 
   StackRecord(const Expr* e, const SourceInfo* info, const Expr* call,
-              int argnum)
-      : record_variant(ArgRecord{.expr = e,
-                                 .source_info = info,
-                                 .calling_expr = call,
-                                 .call_arg = argnum}),
-        visited(false) {}
+              int argnum) {
+    ArgRecord record;
+    record.expr = e;
+    record.source_info = info;
+    record.calling_expr = call;
+    record.call_arg = argnum;
+    record_variant = record;
+  }
 
   StackRecordKind record_variant;
-  bool visited;
+  bool visited = false;
 };
 
 struct PreVisitor {

eval/public/cel_value.cc

@@ -156,6 +156,8 @@ std::string CelValue::TypeName(Type value_type) {
       return "CelError";
     case Type::kAny:
       return "Any type";
+    default:
+      return "unknown";
   }
 }
 
@@ -209,7 +211,7 @@ CelValue CelValue::ObtainCelType() const {
       return *this;
     case Type::kError:
       return *this;
-    case Type::kAny: {
+    default: {
       static const CelError* invalid_type_error =
           new CelError(absl::InvalidArgumentError("Unsupported CelValue type"));
       return CreateError(invalid_type_error);

internal/BUILD

@@ -31,19 +31,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "status_util",
-    srcs = ["status_util.cc"],
-    hdrs = [
-        "status_util.h",
-    ],
-    deps = [
-        "@com_google_absl//absl/strings",
-        "@com_google_googleapis//google/rpc:code_cc_proto",
-        "@com_google_googleapis//google/rpc:status_cc_proto",
-    ],
-)
-
 cc_library(
     name = "proto_util",
     srcs = ["proto_util.cc"],