From b2ff4f82c2ac82a9e2d68a08a8a5e0284a409daa Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Thu, 3 Feb 2022 01:05:20 +0000 Subject: [PATCH] Fixing tests --- .../com/google/protobuf/InvalidProtocolBufferException.java | 4 ++-- .../protobuf/compiler/cpp/cpp_parse_function_generator.cc | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/java/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java b/java/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java index 71ccb14b1..bd7039e1b 100644 --- a/java/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java +++ b/java/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java @@ -47,11 +47,11 @@ public class InvalidProtocolBufferException extends IOException { super(description); } - public InvalidProtocolBufferException(Exception e) { + public InvalidProtocolBufferException(IOException e) { super(e.getMessage(), e); } - public InvalidProtocolBufferException(String description, Exception e) { + public InvalidProtocolBufferException(String description, IOException e) { super(description, e); } diff --git a/src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc b/src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc index a0bd93756..1070cae06 100644 --- a/src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc +++ b/src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc @@ -283,7 +283,8 @@ TailCallTableInfo::TailCallTableInfo( // Fill in mini table entries. for (const FieldDescriptor* field : ordered_fields) { field_entries.push_back( - {field, (HasHasbit(field) ? has_bit_indices[field->index()] : -1)}); + {field, (HasHasbit(field) ? has_bit_indices[field->index()] : -1), 0, 0} + ); auto& entry = field_entries.back(); if (field->type() == FieldDescriptor::TYPE_MESSAGE ||