all: use typed variant of protoreflect.ValueOf
Change-Id: I7479632b57e7c8efade12a2eb2b855e9c321adb1
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/196037
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/internal/impl/message_reflect_field.go b/internal/impl/message_reflect_field.go
index e55b6de..e384aa3 100644
--- a/internal/impl/message_reflect_field.go
+++ b/internal/impl/message_reflect_field.go
@@ -99,7 +99,7 @@
}
rv = rv.Elem().Elem().Field(0)
if rv.IsNil() {
- rv.Set(conv.GoValueOf(pref.ValueOf(conv.New().Message())))
+ rv.Set(conv.GoValueOf(pref.ValueOfMessage(conv.New().Message())))
}
return conv.PBValueOf(rv)
},
@@ -324,14 +324,14 @@
get: func(p pointer) pref.Value {
lazyInit()
if p.IsNil() {
- return pref.ValueOf(messageType.Zero())
+ return pref.ValueOfMessage(messageType.Zero())
}
fs := p.Apply(weakOffset).WeakFields()
m, ok := (*fs)[num]
if !ok {
- return pref.ValueOf(messageType.Zero())
+ return pref.ValueOfMessage(messageType.Zero())
}
- return pref.ValueOf(m.(pref.ProtoMessage).ProtoReflect())
+ return pref.ValueOfMessage(m.(pref.ProtoMessage).ProtoReflect())
},
set: func(p pointer, v pref.Value) {
lazyInit()
@@ -356,7 +356,7 @@
m = messageType.New().Interface().(piface.MessageV1)
(*fs)[num] = m
}
- return pref.ValueOf(m.(pref.ProtoMessage).ProtoReflect())
+ return pref.ValueOfMessage(m.(pref.ProtoMessage).ProtoReflect())
},
newMessage: func() pref.Message {
lazyInit()
@@ -364,7 +364,7 @@
},
newField: func() pref.Value {
lazyInit()
- return pref.ValueOf(messageType.New())
+ return pref.ValueOfMessage(messageType.New())
},
}
}