@@ -371,7 +371,7 @@ TEST_F(SymbolFilePDBTests, TestSimpleClassTypes) {
371371 CompilerType compiler_type = udt_type->GetForwardCompilerType ();
372372 EXPECT_TRUE (TypeSystemClang::IsClassType (compiler_type.GetOpaqueQualType ()));
373373 EXPECT_EQ (GetGlobalConstantInteger (session, " sizeof_Class" ),
374- udt_type->GetByteSize (nullptr ));
374+ llvm::expectedToOptional ( udt_type->GetByteSize (nullptr ) ));
375375}
376376
377377TEST_F (SymbolFilePDBTests, TestNestedClassTypes) {
@@ -427,7 +427,7 @@ TEST_F(SymbolFilePDBTests, TestNestedClassTypes) {
427427 EXPECT_TRUE (TypeSystemClang::IsClassType (compiler_type.GetOpaqueQualType ()));
428428
429429 EXPECT_EQ (GetGlobalConstantInteger (session, " sizeof_NestedClass" ),
430- udt_type->GetByteSize (nullptr ));
430+ llvm::expectedToOptional ( udt_type->GetByteSize (nullptr ) ));
431431}
432432
433433TEST_F (SymbolFilePDBTests, TestClassInNamespace) {
@@ -471,7 +471,7 @@ TEST_F(SymbolFilePDBTests, TestClassInNamespace) {
471471 EXPECT_TRUE (TypeSystemClang::IsClassType (compiler_type.GetOpaqueQualType ()));
472472
473473 EXPECT_EQ (GetGlobalConstantInteger (session, " sizeof_NSClass" ),
474- udt_type->GetByteSize (nullptr ));
474+ llvm::expectedToOptional ( udt_type->GetByteSize (nullptr ) ));
475475}
476476
477477TEST_F (SymbolFilePDBTests, TestEnumTypes) {
@@ -501,7 +501,7 @@ TEST_F(SymbolFilePDBTests, TestEnumTypes) {
501501 std::string sizeof_var = " sizeof_" ;
502502 sizeof_var.append (Enum);
503503 EXPECT_EQ (GetGlobalConstantInteger (session, sizeof_var),
504- enum_type->GetByteSize (nullptr ));
504+ llvm::expectedToOptional ( enum_type->GetByteSize (nullptr ) ));
505505 }
506506}
507507
@@ -547,7 +547,7 @@ TEST_F(SymbolFilePDBTests, TestTypedefs) {
547547 std::string sizeof_var = " sizeof_" ;
548548 sizeof_var.append (Typedef);
549549 EXPECT_EQ (GetGlobalConstantInteger (session, sizeof_var),
550- typedef_type->GetByteSize (nullptr ));
550+ llvm::expectedToOptional ( typedef_type->GetByteSize (nullptr ) ));
551551 }
552552}
553553
0 commit comments