From 475927d04606433f4ad70b9e41bbe731994ba9b6 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 25 Jan 2022 14:31:51 +0100 Subject: [PATCH] [AsmParserTest] Avoid pointer element type accesses (NFC) Use isOpaqueOrPointeeTypeEquals() instead. --- llvm/unittests/AsmParser/AsmParserTest.cpp | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/llvm/unittests/AsmParser/AsmParserTest.cpp b/llvm/unittests/AsmParser/AsmParserTest.cpp index 7639ff5..9d2333b 100644 --- a/llvm/unittests/AsmParser/AsmParserTest.cpp +++ b/llvm/unittests/AsmParser/AsmParserTest.cpp @@ -252,9 +252,7 @@ TEST(AsmParserTest, TypeWithSlotMappingParsing) { ASSERT_TRUE(Ty->isPointerTy()); PointerType *PT = cast(Ty); - Ty = PT->getPointerElementType(); - ASSERT_TRUE(Ty->isIntegerTy()); - ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32); + ASSERT_TRUE(PT->isOpaqueOrPointeeTypeMatches(Type::getIntNTy(Ctx, 32))); // Two indirections. Ty = parseType("i32**", Error, M, &Mapping); @@ -262,13 +260,8 @@ TEST(AsmParserTest, TypeWithSlotMappingParsing) { ASSERT_TRUE(Ty->isPointerTy()); PT = cast(Ty); - Ty = PT->getPointerElementType(); - ASSERT_TRUE(Ty->isPointerTy()); - - PT = cast(Ty); - Ty = PT->getPointerElementType(); - ASSERT_TRUE(Ty->isIntegerTy()); - ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32); + Type *ExpectedElemTy = PointerType::getUnqual(Type::getIntNTy(Ctx, 32)); + ASSERT_TRUE(PT->isOpaqueOrPointeeTypeMatches(ExpectedElemTy)); // Check that we reject types with garbage. Ty = parseType("i32 garbage", Error, M, &Mapping); @@ -386,9 +379,7 @@ TEST(AsmParserTest, TypeAtBeginningWithSlotMappingParsing) { ASSERT_TRUE(Read == 4); PointerType *PT = cast(Ty); - Ty = PT->getPointerElementType(); - ASSERT_TRUE(Ty->isIntegerTy()); - ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32); + ASSERT_TRUE(PT->isOpaqueOrPointeeTypeMatches(Type::getIntNTy(Ctx, 32))); // Two indirections. Ty = parseTypeAtBeginning("i32**", Read, Error, M, &Mapping); @@ -397,13 +388,8 @@ TEST(AsmParserTest, TypeAtBeginningWithSlotMappingParsing) { ASSERT_TRUE(Read == 5); PT = cast(Ty); - Ty = PT->getPointerElementType(); - ASSERT_TRUE(Ty->isPointerTy()); - - PT = cast(Ty); - Ty = PT->getPointerElementType(); - ASSERT_TRUE(Ty->isIntegerTy()); - ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32); + Type *ExpectedElemTy = PointerType::getUnqual(Type::getIntNTy(Ctx, 32)); + ASSERT_TRUE(PT->isOpaqueOrPointeeTypeMatches(ExpectedElemTy)); // Check that we reject types with garbage. Ty = parseTypeAtBeginning("i32 garbage", Read, Error, M, &Mapping); -- 2.7.4