From 74aae6a46c51fc5a8b04b336c49592bc03ef4752 Mon Sep 17 00:00:00 2001
From: Joe Tsai <joetsai@digital-static.net>
Date: Wed, 27 May 2020 14:47:34 -0700
Subject: [PATCH] encoding/prototext: simplify decoder.unmarshalAny

A hasFields map that only ever contains 3 entries seems more
complex than necessary. It's simpler and more performant to
just track three discrete boolean variables for each of the cases.

Change-Id: I1ba20da130f6b560a57fe8c3a73968983e563b48
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/235477
Reviewed-by: Herbie Ong <herbie@google.com>
---
 encoding/prototext/decode.go | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/encoding/prototext/decode.go b/encoding/prototext/decode.go
index c2f8f28f..4bff87d7 100644
--- a/encoding/prototext/decode.go
+++ b/encoding/prototext/decode.go
@@ -597,13 +597,9 @@ Loop:
 func (d decoder) unmarshalAny(m pref.Message, checkDelims bool) error {
 	var typeURL string
 	var bValue []byte
-
-	// hasFields tracks which valid fields have been seen in the loop below in
-	// order to flag an error if there are duplicates or conflicts. It may
-	// contain the strings "type_url", "value" and "expanded".  The literal
-	// "expanded" is used to indicate that the expanded form has been
-	// encountered already.
-	hasFields := map[string]bool{}
+	var seenTypeUrl bool
+	var seenValue bool
+	var isExpanded bool
 
 	if checkDelims {
 		tok, err := d.Read()
@@ -644,10 +640,10 @@ Loop:
 
 			switch tok.IdentName() {
 			case "type_url":
-				if hasFields["type_url"] {
+				if seenTypeUrl {
 					return d.newError(tok.Pos(), "duplicate Any type_url field")
 				}
-				if hasFields["expanded"] {
+				if isExpanded {
 					return d.newError(tok.Pos(), "conflict with [%s] field", typeURL)
 				}
 				tok, err := d.Read()
@@ -659,13 +655,13 @@ Loop:
 				if !ok {
 					return d.newError(tok.Pos(), "invalid Any type_url: %v", tok.RawString())
 				}
-				hasFields["type_url"] = true
+				seenTypeUrl = true
 
 			case "value":
-				if hasFields["value"] {
+				if seenValue {
 					return d.newError(tok.Pos(), "duplicate Any value field")
 				}
-				if hasFields["expanded"] {
+				if isExpanded {
 					return d.newError(tok.Pos(), "conflict with [%s] field", typeURL)
 				}
 				tok, err := d.Read()
@@ -677,7 +673,7 @@ Loop:
 					return d.newError(tok.Pos(), "invalid Any value: %v", tok.RawString())
 				}
 				bValue = []byte(s)
-				hasFields["value"] = true
+				seenValue = true
 
 			default:
 				if !d.opts.DiscardUnknown {
@@ -686,10 +682,10 @@ Loop:
 			}
 
 		case text.TypeName:
-			if hasFields["expanded"] {
+			if isExpanded {
 				return d.newError(tok.Pos(), "cannot have more than one type")
 			}
-			if hasFields["type_url"] {
+			if seenTypeUrl {
 				return d.newError(tok.Pos(), "conflict with type_url field")
 			}
 			typeURL = tok.TypeName()
@@ -698,7 +694,7 @@ Loop:
 			if err != nil {
 				return err
 			}
-			hasFields["expanded"] = true
+			isExpanded = true
 
 		default:
 			if !d.opts.DiscardUnknown {