Merge "Suppress nullptr dereference warnings." am: e8c3da7688 am: 8a4db14e94 am: a07a2a5f7fHEADandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-dev

Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/slang/+/2367029

Change-Id: I06264e9062efb81292e6e1616752e7d5bd1a5bc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/slang_rs_export_type.cpp b/slang_rs_export_type.cpp
index afeb6c5..ffe8ffc 100644
--- a/slang_rs_export_type.cpp
+++ b/slang_rs_export_type.cpp
@@ -333,6 +333,8 @@ static const clang::Type *TypeExportableHelper(
         //
         // TODO(zonr/srhines): allow bit fields of size 8, 16, 32
         if (FD->isBitField()) {
+          // Context can be null from NormalizeType?
+          slangAssert(Context);
           Context->ReportError(
               FD->getLocation(),
               "bit fields are not able to be exported: '%0.%1'")
@@ -415,6 +417,8 @@ static const clang::Type *TypeExportableHelper(
     case clang::Type::Enum: {
       // FIXME: We currently convert enums to integers, rather than reflecting
       // a more complete (and nicer type-safe Java version).
+      // Context can be null from NormalizeType?
+      slangAssert(Context);
       return Context->getASTContext().IntTy.getTypePtr();
     }
     default: {
@@ -797,6 +801,8 @@ llvm::StringRef RSExportType::GetTypeName(const clang::Type* T) {
       const clang::PointerType *P = static_cast<const clang::PointerType*>(CTI);
       const clang::Type *PT = GetPointeeType(P);
       llvm::StringRef PointeeName;
+      // Passing nullptr as Context to NormalizeType can cause TypeExportableHelper
+      // to dereference a null Context?
       if (NormalizeType(PT, PointeeName, nullptr, nullptr,
                         NotLegacyKernelArgument)) {
         char *Name = new char[ 1 /* * */ + PointeeName.size() + 1 ];