Merge pull request #58 from google/cpp-sync

Export of internal changes

Author: TristonianJones

WORKSPACE

@@ -126,9 +126,9 @@ antlr_dependencies(472)
 
 http_archive(
     name = "antlr4_runtimes",
-    sha256 = "4d0714f441333a63e50031c9e8e4890c78f3d21e053d46416949803e122a6574",
-    strip_prefix = "antlr4-4.7.1",
-    urls = ["https://github.com/antlr/antlr4/archive/4.7.1.tar.gz"],
+    sha256 = "46f5e1af5f4bd28ade55cb632f9a069656b31fc8c2408f9aa045f9b5f5caad64",
+    strip_prefix = "antlr4-4.7.2",
+    urls = ["https://github.com/antlr/antlr4/archive/4.7.2.tar.gz"],
     build_file_content = """
 package(default_visibility = ["//visibility:public"])
 cc_library(

bazel/antlr.bzl

@@ -42,4 +42,5 @@ def antlr_cc_library(name, src, listener = False, visitor = True):
         toolchains = [":" + generated],
         # ANTLR runtime does not build with dynamic linking
         linkstatic = True,
+        alwayslink = 1,
     )

eval/compiler/flat_expr_builder_test.cc

@@ -143,7 +143,7 @@ TEST(FlatExprBuilderTest, DelayedFunctionResolutionErrors) {
 
   ASSERT_THAT(warnings, testing::SizeIs(1));
   EXPECT_EQ(warnings[0].code(), absl::StatusCode::kInvalidArgument);
-  EXPECT_THAT(warnings[0].message(),
+  EXPECT_THAT(std::string(warnings[0].message()),
               testing::HasSubstr("No overloads provided"));
 }
 

eval/eval/BUILD

@@ -672,31 +672,3 @@ cc_test(
         "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto",
     ],
 )
-
-cc_library(
-    name = "set_util",
-    srcs = ["set_util.cc"],
-    hdrs = ["set_util.h"],
-    copts = ["-std=c++14"],
-    deps = ["//eval/public:cel_value"],
-)
-
-cc_test(
-    name = "set_util_test",
-    size = "small",
-    srcs = [
-        "set_util_test.cc",
-    ],
-    copts = ["-std=c++14"],
-    deps = [
-        ":container_backed_list_impl",
-        ":container_backed_map_impl",
-        ":set_util",
-        "//eval/public:cel_value",
-        "//eval/public:unknown_set",
-        "@com_github_google_googletest//:gtest_main",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/time",
-        "@com_google_protobuf//:protobuf",
-    ],
-)

eval/eval/function_step.cc

@@ -47,7 +47,7 @@ bool ShouldAcceptOverload(const CelFunction* function,
   if (function == nullptr) {
     return false;
   }
-  for (int i = 0; i < arguments.size(); i++) {
+  for (size_t i = 0; i < arguments.size(); i++) {
     if (arguments[i].IsUnknownSet() || arguments[i].IsError()) {
       return IsNonStrict(function->descriptor().name());
     }
@@ -65,7 +65,7 @@ std::vector<CelValue> CheckForPartialUnknowns(
     absl::Span<const AttributeTrail> attrs) {
   std::vector<CelValue> result;
   result.reserve(args.size());
-  for (int i = 0; i < args.size(); i++) {
+  for (size_t i = 0; i < args.size(); i++) {
     auto attr_set = frame->unknowns_utility().CheckForUnknowns(
         attrs.subspan(i, 1), /*use_partial=*/true);
     if (!attr_set.attributes().empty()) {

eval/eval/function_step_test.cc

@@ -540,6 +540,7 @@ std::string TestNameFn(testing::TestParamInfo<UnknownProcessingOptions> opt) {
     case UnknownProcessingOptions::kAttributeAndFunction:
       return "attribute_and_function";
   }
+  return "";
 }
 
 INSTANTIATE_TEST_SUITE_P(

eval/public/BUILD

@@ -573,7 +573,7 @@ cc_library(
         ":cel_function",
         ":cel_options",
         ":cel_value",
-        "//eval/eval:set_util",
+        ":set_util",
         "@com_google_absl//absl/container:btree",
         "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto",
     ],
@@ -623,3 +623,31 @@ cc_test(
         "@com_google_protobuf//:protobuf",
     ],
 )
+
+cc_library(
+    name = "set_util",
+    srcs = ["set_util.cc"],
+    hdrs = ["set_util.h"],
+    copts = ["-std=c++14"],
+    deps = ["//eval/public:cel_value"],
+)
+
+cc_test(
+    name = "set_util_test",
+    size = "small",
+    srcs = [
+        "set_util_test.cc",
+    ],
+    copts = ["-std=c++14"],
+    deps = [
+        ":cel_value",
+        ":set_util",
+        ":unknown_set",
+        "//eval/eval:container_backed_list_impl",
+        "//eval/eval:container_backed_map_impl",
+        "@com_github_google_googletest//:gtest_main",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/time",
+        "@com_google_protobuf//:protobuf",
+    ],
+)

eval/public/activation.h

@@ -39,15 +39,20 @@ class BaseActivation {
                                              google::protobuf::Arena*) const = 0;
 
   // Check whether a select path is unknown.
-  virtual bool IsPathUnknown(absl::string_view) const = 0;
+  virtual bool IsPathUnknown(absl::string_view) const { return false; }
 
   // Return FieldMask defining the list of unknown paths.
-  virtual const google::protobuf::FieldMask unknown_paths() const = 0;
+  virtual const google::protobuf::FieldMask& unknown_paths() const {
+    return google::protobuf::FieldMask::default_instance();
+  }
 
   // Return the collection of attribute patterns that determine "unknown"
   // values.
   virtual const std::vector<CelAttributePattern>& unknown_attribute_patterns()
-      const = 0;
+      const {
+    static const std::vector<CelAttributePattern> empty;
+    return empty;
+  }
 
   virtual ~BaseActivation() {}
 };
@@ -108,7 +113,7 @@ class Activation : public BaseActivation {
   }
 
   // Return FieldMask defining the list of unknown paths.
-  const google::protobuf::FieldMask unknown_paths() const override {
+  const google::protobuf::FieldMask& unknown_paths() const override {
     return unknown_paths_;
   }
 

eval/public/activation_test.cc

@@ -13,7 +13,6 @@ namespace runtime {
 namespace {
 
 using ::google::protobuf::Arena;
-using testing::_;
 using testing::ElementsAre;
 using testing::Eq;
 using testing::HasSubstr;

eval/public/ast_traverse.cc

@@ -36,7 +36,7 @@ namespace {
 
 struct StackRecord {
  public:
-  static const int kNotCallArg = -1;
+  static constexpr int kNotCallArg = -1;
 
   StackRecord(const Expr *e, const SourceInfo *info)
       : expr(e),