diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 04:47:35 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 04:47:35 +0000 |
commit | 8f537592fc0f28c94502a4d1bd463d50e4a9e6c4 (patch) | |
tree | a85f0aebda6323f25951bba64272fccba9821150 | |
parent | f06ab632e477c9863c2c60d4e623b66b6e0e5b34 (diff) | |
parent | 8e9a212552c9096cfeccaacd65dea1d1bca88107 (diff) | |
download | slang-android14-mainline-adservices-release.tar.gz |
Snap for 10453563 from 8e9a212552c9096cfeccaacd65dea1d1bca88107 to mainline-adservices-releaseaml_ads_341720000aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050android14-mainline-adservices-release
Change-Id: I40ce3cb4b99b06ac25267db57998a13e4083a84f
-rw-r--r-- | OWNERS | 5 | ||||
-rw-r--r-- | slang_rs_export_type.cpp | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -1,5 +1,2 @@ -butlermichael@google.com -dgross@google.com -jeanluc@google.com -miaowang@google.com +include platform/frameworks/rs:/RS_OWNERS # Bug component: 43047 srhines@google.com 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 ]; |