From 10acd37e932039cac0fa32e3a8d158c7300fa57b Mon Sep 17 00:00:00 2001 From: Serdar Kocdemir Date: Fri, 4 Oct 2024 12:24:56 +0000 Subject: [PATCH] Update decoder.py to use try_unbox on destroy calls Missing code generator changes for aosp/3272729. Reviewed-by: Gurchetan Singh Part-of: --- src/gfxstream/codegen/scripts/cereal/decoder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gfxstream/codegen/scripts/cereal/decoder.py b/src/gfxstream/codegen/scripts/cereal/decoder.py index 6a6b3774a1c..1e96ba015bd 100644 --- a/src/gfxstream/codegen/scripts/cereal/decoder.py +++ b/src/gfxstream/codegen/scripts/cereal/decoder.py @@ -164,13 +164,13 @@ def emit_unmarshal(typeInfo, param, cgen, output = False, destroy = False, noUnb lenAccessGuard = cgen.generalLengthAccessGuard(param) if None == lenAccess or "1" == lenAccess: cgen.stmt("boxed_%s_preserve = %s" % (param.paramName, param.paramName)) - cgen.stmt("%s = unbox_%s(%s)" % (param.paramName, param.typeName, param.paramName)) + cgen.stmt("%s = try_unbox_%s(%s)" % (param.paramName, param.typeName, param.paramName)) else: if lenAccessGuard is not None: cgen.beginIf(lenAccessGuard) cgen.beginFor("uint32_t i = 0", "i < %s" % lenAccess, "++i") cgen.stmt("boxed_%s_preserve[i] = %s[i]" % (param.paramName, param.paramName)) - cgen.stmt("((%s*)(%s))[i] = unbox_%s(%s[i])" % (param.typeName, param.paramName, param.typeName, param.paramName)) + cgen.stmt("((%s*)(%s))[i] = try_unbox_%s(%s[i])" % (param.typeName, param.paramName, param.typeName, param.paramName)) cgen.endFor() if lenAccessGuard is not None: cgen.endIf()