Merge pull request #513 from fowles/main

Small fixes to compile with stricter warnings

upb/test_table.cc

@@ -354,7 +354,6 @@ class TypedIntTable {
 
 }  // namespace upb
 
-bool benchmark = false;
 #define CPU_TIME_PER_TEST 0.5
 
 using std::vector;

upbc/protoc-gen-upb.cc

@@ -312,7 +312,7 @@ bool HasNonZeroDefault(const protobuf::FieldDescriptor* field) {
       return field->default_value_enum()->number() != 0;
   }
   ABSL_ASSERT(false);
-  return "XXX";
+  return false;
 }
 
 std::string FieldDefault(const protobuf::FieldDescriptor* field) {