Merge "Use clang-r412851" am: db1507471c

Original change: https://android-review.googlesource.com/c/platform/development/+/1597159

Change-Id: Id0e5f07c71e2e8e45021d9c83698e61f5fce75f4
This commit is contained in:
Pirama Arumuga Nainar
2021-03-18 04:01:37 +00:00
committed by Automerger Merge Worker
2 changed files with 5 additions and 6 deletions

View File

@@ -15,5 +15,5 @@
# limitations under the License.
export LLVM_BUILD_HOST_TOOLS=true
export LLVM_PREBUILTS_VERSION=clang-r407598b
export LLVM_RELEASE_VERSION=12.0.2
export LLVM_PREBUILTS_VERSION=clang-r412851
export LLVM_RELEASE_VERSION=12.0.3

View File

@@ -294,10 +294,9 @@ bool ABIWrapper::CreateBasicNamedAndTypedDecl(
// Temporary hack: Skip the auto types, incomplete types and dependent types.
if (type_class != clang::Type::Auto && !base_type->isIncompleteType() &&
!base_type->isDependentType()) {
std::pair<clang::CharUnits, clang::CharUnits> size_and_alignment =
ast_contextp_->getTypeInfoInChars(canonical_type);
typep->SetSize(size_and_alignment.first.getQuantity());
typep->SetAlignment(size_and_alignment.second.getQuantity());
auto type_info_chars = ast_contextp_->getTypeInfoInChars(canonical_type);
typep->SetSize(type_info_chars.Width.getQuantity());
typep->SetAlignment(type_info_chars.Align.getQuantity());
}
std::string human_name = QualTypeToString(canonical_type);