This revision was landed with ongoing or failed builds. This revision was automatically updated to reflect the committed changes. Closed by commit rG711179b5816a: [OPENMP]Fix PR48759: "fatal error" when compile with preprocessed file. (authored by ABataev).
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D97945/new/ https://reviews.llvm.org/D97945 Files: clang/lib/CodeGen/CGOpenMPRuntime.cpp clang/test/OpenMP/target_unknown_file.cpp Index: clang/test/OpenMP/target_unknown_file.cpp =================================================================== --- /dev/null +++ clang/test/OpenMP/target_unknown_file.cpp @@ -0,0 +1,13 @@ +// RUN: %clang_cc1 -verify -fopenmp -triple x86_64-apple-darwin10.6.0 -emit-llvm -o - %s 2>&1 | FileCheck %s +// expected-no-diagnostics + +// CHECK-NOT: fatal error: cannot open file + +// CHECK: call void @__omp_offloading_{{.+}}() +# 1 "unknown.xxxxxxxx" +void a() { +#pragma omp target + ; +} + +// CHECK-NOT: fatal error: cannot open file Index: clang/lib/CodeGen/CGOpenMPRuntime.cpp =================================================================== --- clang/lib/CodeGen/CGOpenMPRuntime.cpp +++ clang/lib/CodeGen/CGOpenMPRuntime.cpp @@ -1648,9 +1648,13 @@ assert(PLoc.isValid() && "Source location is expected to be always valid."); llvm::sys::fs::UniqueID ID; - if (auto EC = llvm::sys::fs::getUniqueID(PLoc.getFilename(), ID)) - SM.getDiagnostics().Report(diag::err_cannot_open_file) - << PLoc.getFilename() << EC.message(); + if (auto EC = llvm::sys::fs::getUniqueID(PLoc.getFilename(), ID)) { + PLoc = SM.getPresumedLoc(Loc, /*UseLineDirectives=*/false); + assert(PLoc.isValid() && "Source location is expected to be always valid."); + if (auto EC = llvm::sys::fs::getUniqueID(PLoc.getFilename(), ID)) + SM.getDiagnostics().Report(diag::err_cannot_open_file) + << PLoc.getFilename() << EC.message(); + } DeviceID = ID.getDevice(); FileID = ID.getFile();
Index: clang/test/OpenMP/target_unknown_file.cpp =================================================================== --- /dev/null +++ clang/test/OpenMP/target_unknown_file.cpp @@ -0,0 +1,13 @@ +// RUN: %clang_cc1 -verify -fopenmp -triple x86_64-apple-darwin10.6.0 -emit-llvm -o - %s 2>&1 | FileCheck %s +// expected-no-diagnostics + +// CHECK-NOT: fatal error: cannot open file + +// CHECK: call void @__omp_offloading_{{.+}}() +# 1 "unknown.xxxxxxxx" +void a() { +#pragma omp target + ; +} + +// CHECK-NOT: fatal error: cannot open file Index: clang/lib/CodeGen/CGOpenMPRuntime.cpp =================================================================== --- clang/lib/CodeGen/CGOpenMPRuntime.cpp +++ clang/lib/CodeGen/CGOpenMPRuntime.cpp @@ -1648,9 +1648,13 @@ assert(PLoc.isValid() && "Source location is expected to be always valid."); llvm::sys::fs::UniqueID ID; - if (auto EC = llvm::sys::fs::getUniqueID(PLoc.getFilename(), ID)) - SM.getDiagnostics().Report(diag::err_cannot_open_file) - << PLoc.getFilename() << EC.message(); + if (auto EC = llvm::sys::fs::getUniqueID(PLoc.getFilename(), ID)) { + PLoc = SM.getPresumedLoc(Loc, /*UseLineDirectives=*/false); + assert(PLoc.isValid() && "Source location is expected to be always valid."); + if (auto EC = llvm::sys::fs::getUniqueID(PLoc.getFilename(), ID)) + SM.getDiagnostics().Report(diag::err_cannot_open_file) + << PLoc.getFilename() << EC.message(); + } DeviceID = ID.getDevice(); FileID = ID.getFile();
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits