tree 0b97c5d996f0ad85436634ae0d303ac12e7c183e
parent c7f2beeef028cf1b61be634fafc4a6eaf5d25a8c
author Damien Neil <dneil@google.com> 1573169444 -0800
committer Damien Neil <dneil@google.com> 1573172965 +0000

internal/filedesc: move message options to L1 initialization

Avoid a deadlock when registering a legacy ExtensionType, caused by
initialization of the "internal/impl".ExtensionInfo calling IsMessageSet
on the MessageDescriptor of the type being extended.

We can avoid this deadlock either by initializing the ExtensionType
outside of the GlobalTypes mutex, or by moving IsMessageSet to L1
initialization of the MessageDescriptor so that it doesn't trigger lazy
init.

CL 204804 takes the former approach; this CL takes the latter.

Change-Id: Idfc1ed36a23a139839290ea32492142a17f68cf5
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/205957
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>