diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2019-01-17 12:29:00 -0800 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2019-01-17 12:29:00 -0800 |
| commit | e13e1c46ae06a29ddebc9f1c2220d3a8544433dd (patch) | |
| tree | 75c52050242cc8e2e0cfbdc4897565e0961d33e8 /upb/pb | |
| parent | 01557462cc211cec9c7bddede77995b938067ea5 (diff) | |
| parent | e5ccbdcdd02fba915bdac60a290c824ca2e5ef53 (diff) | |
Merge branch 'arrayapi' into defcleanup
Diffstat (limited to 'upb/pb')
| -rw-r--r-- | upb/pb/compile_decoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/upb/pb/compile_decoder.c b/upb/pb/compile_decoder.c index c5d8d9b..75cff48 100644 --- a/upb/pb/compile_decoder.c +++ b/upb/pb/compile_decoder.c @@ -615,8 +615,8 @@ static void generate_delimfield(compiler *c, const upb_fielddef *f, putop(c, OP_STARTSTR, getsel(f, UPB_HANDLER_STARTSTR)); /* Need to emit even if no handler to skip past the string. */ putop(c, OP_STRING, getsel(f, UPB_HANDLER_STRING)); - putop(c, OP_POP); maybeput(c, OP_ENDSTR, h, f, UPB_HANDLER_ENDSTR); + putop(c, OP_POP); putop(c, OP_SETDELIM); putop(c, OP_CHECKDELIM, LABEL_LOOPBREAK); putchecktag(c, f, UPB_WIRE_TYPE_DELIMITED, LABEL_LOOPBREAK); @@ -631,8 +631,8 @@ static void generate_delimfield(compiler *c, const upb_fielddef *f, putop(c, OP_PUSHLENDELIM); putop(c, OP_STARTSTR, getsel(f, UPB_HANDLER_STARTSTR)); putop(c, OP_STRING, getsel(f, UPB_HANDLER_STRING)); - putop(c, OP_POP); maybeput(c, OP_ENDSTR, h, f, UPB_HANDLER_ENDSTR); + putop(c, OP_POP); putop(c, OP_SETDELIM); } } |