commit 925ace70ac7426c3f8b5c0bfb75aa9601f071de4
author Than McIntosh <thanm@google.com> Tue Oct 05 16:25:45 2021 -0400
committer Ian Lance Taylor <iant@golang.org> Tue Oct 05 22:05:37 2021 +0000
tree 26f5d5c8675d99df3e2bdfe76ecba83309ccf620
parent bbc1effb1a8a757a38011074f1d4477fae3936f5

compiler: workaround for C++ build template matching quirk

Tweak a couple of places in the types code to use nullptr instead of
NULL to work around a template matching quirk when using certain build
compilers.

Change-Id: Ia349c998a7dd90b4c2df589c7ceeaedcee6cde01
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/354151
Trust: Than McIntosh <thanm@google.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

go/types.cc

diff --git a/go/types.cc b/go/types.cc
index c6ce623..0f66661 100644
--- a/go/types.cc
+++ b/go/types.cc
@@ -2259,7 +2259,7 @@
 Type::build_equal_function(Gogo* gogo, Named_type* name, int64_t size,
 			   Function_type* equal_fntype)
 {
-  std::pair<Type*, Named_object*> val(name != NULL ? name : this, NULL);
+  std::pair<Type*, Named_object*> val(name != NULL ? name : this, nullptr);
   std::pair<Type_function::iterator, bool> ins =
     Type::type_equal_functions_table.insert(val);
   if (!ins.second)
@@ -6413,7 +6413,7 @@
 				    bool is_pointer)
 {
   std::pair<Struct_type*, Struct_type::Struct_method_table_pair*>
-    val(this, NULL);
+    val(this, nullptr);
   std::pair<Struct_type::Struct_method_tables::iterator, bool> ins =
     Struct_type::struct_method_tables.insert(val);