WIP

mongodb · May 15, 2024 · 82142f6 · 82142f6
1 parent 1db6753
commit 82142f6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/bson/bsoncodec/bsoncodec.go b/bson/bsoncodec/bsoncodec.go
@@ -343,17 +343,8 @@ type decodeAdapter struct {
 var _ ValueDecoder = decodeAdapter{}
 var _ typeDecoder = decodeAdapter{}
 
-// decodeTypeOrValue calls decoder.decodeType is decoder is a typeDecoder. Otherwise, it allocates a new element of type
-// t and calls decoder.DecodeValue on it.
-func decodeTypeOrValue(decoder ValueDecoder, dc DecodeContext, vr bsonrw.ValueReader, t reflect.Type) (reflect.Value, error) {
-	td, _ := decoder.(typeDecoder)
-	val := reflect.New(t).Elem()
-	return decodeTypeOrValueWithInfo(decoder, td, dc, vr, val, true)
-}
-
-func decodeTypeOrValueWithInfo(vd ValueDecoder, td typeDecoder, dc DecodeContext, vr bsonrw.ValueReader, val reflect.Value, convert bool) (reflect.Value, error) {
+func decodeTypeOrValueWithInfo(vd ValueDecoder, td typeDecoder, dc DecodeContext, vr bsonrw.ValueReader, t reflect.Type, convert bool) (reflect.Value, error) {
 	if td != nil {
-		t := val.Type()
 		val, err := td.decodeType(dc, vr, t)
 		if err == nil && convert && val.Type() != t {
 			// This conversion step is necessary for slices and maps. If a user declares variables like:
@@ -368,6 +359,7 @@ func decodeTypeOrValueWithInfo(vd ValueDecoder, td typeDecoder, dc DecodeContext
 		return val, err
 	}
 
+	val := reflect.New(t).Elem()
 	err := vd.DecodeValue(dc, vr, val)
 	return val, err
 }

diff --git a/bson/bsoncodec/default_value_decoders.go b/bson/bsoncodec/default_value_decoders.go
@@ -185,7 +185,7 @@ func (dvd DefaultValueDecoders) DDecodeValue(dc DecodeContext, vr bsonrw.ValueRe
 		}
 
 		// Pass false for convert because we don't need to call reflect.Value.Convert for tEmpty.
-		elem, err := decodeTypeOrValueWithInfo(decoder, tEmptyTypeDecoder, dc, elemVr, reflect.New(tEmpty).Elem(), false)
+		elem, err := decodeTypeOrValueWithInfo(decoder, tEmptyTypeDecoder, dc, elemVr, tEmpty, false)
 		if err != nil {
 			return err
 		}
@@ -1700,15 +1700,15 @@ func (dvd DefaultValueDecoders) decodeDefault(dc DecodeContext, vr bsonrw.ValueR
 				val.Index(idx).Set(v)
 				e = v
 			}
-			elem, err = decodeTypeOrValueWithInfo(valueDecoder, typeDecoder, dc, vr, e, true)
+			elem, err = decodeTypeOrValueWithInfo(valueDecoder, typeDecoder, dc, vr, e.Type(), true)
 			if err != nil {
 				return nil, newDecodeError(strconv.Itoa(idx), err)
 			}
 			if e.Kind() == reflect.Ptr && e.IsZero() {
 				elem = reflect.Zero(val.Index(idx).Type())
 			}
 		} else {
-			elem, err = decodeTypeOrValueWithInfo(vDecoder, tDecoder, dc, vr, reflect.New(eType).Elem(), true)
+			elem, err = decodeTypeOrValueWithInfo(vDecoder, tDecoder, dc, vr, eType, true)
 			if err != nil {
 				return nil, newDecodeError(strconv.Itoa(idx), err)
 			}

diff --git a/bson/bsoncodec/empty_interface_codec.go b/bson/bsoncodec/empty_interface_codec.go
@@ -128,7 +128,8 @@ func (eic EmptyInterfaceCodec) decodeType(dc DecodeContext, vr bsonrw.ValueReade
 		return emptyValue, err
 	}
 
-	elem, err := decodeTypeOrValue(decoder, dc, vr, rtype)
+	td, _ := decoder.(typeDecoder)
+	elem, err := decodeTypeOrValueWithInfo(decoder, td, dc, vr, rtype, true)
 	if err != nil {
 		return emptyValue, err
 	}

diff --git a/bson/bsoncodec/map_codec.go b/bson/bsoncodec/map_codec.go
@@ -213,7 +213,7 @@ func (mc *MapCodec) DecodeValue(dc DecodeContext, vr bsonrw.ValueReader, val ref
 			return err
 		}
 
-		elem, err := decodeTypeOrValueWithInfo(decoder, eTypeDecoder, dc, vr, reflect.New(eType).Elem(), true)
+		elem, err := decodeTypeOrValueWithInfo(decoder, eTypeDecoder, dc, vr, eType, true)
 		if err != nil {
 			return newDecodeError(key, err)
 		}