[llvm-branch-commits] [flang] 0c60a3b - Revert "[flang]Add new intrinsic function backtrace and complete the TODO of …"
via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Thu Nov 28 02:40:51 PST 2024
Author: Tom Eccles
Date: 2024-11-28T10:40:48Z
New Revision: 0c60a3b204f8a13bf440474a9b28148ede541a87
URL: https://github.com/llvm/llvm-project/commit/0c60a3b204f8a13bf440474a9b28148ede541a87
DIFF: https://github.com/llvm/llvm-project/commit/0c60a3b204f8a13bf440474a9b28148ede541a87.diff
LOG: Revert "[flang]Add new intrinsic function backtrace and complete the TODO of …"
This reverts commit 159e6012beb5cfd9864b4e2a910086d6f1230b03.
Added:
Modified:
flang/include/flang/Optimizer/Builder/IntrinsicCall.h
flang/include/flang/Optimizer/Builder/Runtime/Stop.h
flang/include/flang/Runtime/stop.h
flang/lib/Evaluate/intrinsics.cpp
flang/lib/Optimizer/Builder/IntrinsicCall.cpp
flang/lib/Optimizer/Builder/Runtime/Stop.cpp
flang/runtime/stop.cpp
Removed:
flang/test/Lower/Intrinsics/backtrace.f90
################################################################################
diff --git a/flang/include/flang/Optimizer/Builder/IntrinsicCall.h b/flang/include/flang/Optimizer/Builder/IntrinsicCall.h
index 71955632e48cde..19c623cc1ec006 100644
--- a/flang/include/flang/Optimizer/Builder/IntrinsicCall.h
+++ b/flang/include/flang/Optimizer/Builder/IntrinsicCall.h
@@ -196,7 +196,6 @@ struct IntrinsicLibrary {
fir::ExtendedValue genAssociated(mlir::Type,
llvm::ArrayRef<fir::ExtendedValue>);
mlir::Value genAtand(mlir::Type, llvm::ArrayRef<mlir::Value>);
- void genBacktrace(llvm::ArrayRef<fir::ExtendedValue>);
fir::ExtendedValue genBesselJn(mlir::Type,
llvm::ArrayRef<fir::ExtendedValue>);
fir::ExtendedValue genBesselYn(mlir::Type,
diff --git a/flang/include/flang/Optimizer/Builder/Runtime/Stop.h b/flang/include/flang/Optimizer/Builder/Runtime/Stop.h
index be73cffff021e3..6f764badf6f3a8 100644
--- a/flang/include/flang/Optimizer/Builder/Runtime/Stop.h
+++ b/flang/include/flang/Optimizer/Builder/Runtime/Stop.h
@@ -30,9 +30,6 @@ void genExit(fir::FirOpBuilder &, mlir::Location, mlir::Value status);
/// Generate call to ABORT intrinsic runtime routine.
void genAbort(fir::FirOpBuilder &, mlir::Location);
-/// Generate call to BACKTRACE intrinsic runtime routine.
-void genBacktrace(fir::FirOpBuilder &builder, mlir::Location loc);
-
/// Generate call to crash the program with an error message when detecting
/// an invalid situation at runtime.
void genReportFatalUserError(fir::FirOpBuilder &, mlir::Location,
diff --git a/flang/include/flang/Runtime/stop.h b/flang/include/flang/Runtime/stop.h
index d442f72bfe1fa4..f7c4ffe7403e8e 100644
--- a/flang/include/flang/Runtime/stop.h
+++ b/flang/include/flang/Runtime/stop.h
@@ -29,7 +29,6 @@ NORETURN void RTNAME(ProgramEndStatement)(NO_ARGUMENTS);
// Extensions
NORETURN void RTNAME(Exit)(int status DEFAULT_VALUE(EXIT_SUCCESS));
NORETURN void RTNAME(Abort)(NO_ARGUMENTS);
-void RTNAME(Backtrace)(NO_ARGUMENTS);
// Crash with an error message when the program dynamically violates a Fortran
// constraint.
diff --git a/flang/lib/Evaluate/intrinsics.cpp b/flang/lib/Evaluate/intrinsics.cpp
index 87ce6ed3396676..cdea572c147576 100644
--- a/flang/lib/Evaluate/intrinsics.cpp
+++ b/flang/lib/Evaluate/intrinsics.cpp
@@ -1336,7 +1336,6 @@ static const IntrinsicInterface intrinsicSubroutine[]{
{"stat", AnyInt, Rank::scalar, Optionality::optional,
common::Intent::Out}},
{}, Rank::elemental, IntrinsicClass::atomicSubroutine},
- {"backtrace", {}, {}, Rank::elemental, IntrinsicClass::pureSubroutine},
{"co_broadcast",
{{"a", AnyData, Rank::anyOrAssumedRank, Optionality::required,
common::Intent::InOut},
diff --git a/flang/lib/Optimizer/Builder/IntrinsicCall.cpp b/flang/lib/Optimizer/Builder/IntrinsicCall.cpp
index acb77694d6ebf6..5dfa53e047f421 100644
--- a/flang/lib/Optimizer/Builder/IntrinsicCall.cpp
+++ b/flang/lib/Optimizer/Builder/IntrinsicCall.cpp
@@ -150,7 +150,6 @@ static constexpr IntrinsicHandler handlers[]{
{"atan2pi", &I::genAtanpi},
{"atand", &I::genAtand},
{"atanpi", &I::genAtanpi},
- {"backtrace", &I::genBacktrace},
{"bessel_jn",
&I::genBesselJn,
{{{"n1", asValue}, {"n2", asValue}, {"x", asValue}}},
@@ -2683,12 +2682,6 @@ IntrinsicLibrary::genBesselJn(mlir::Type resultType,
}
}
-// Backtrace
-void IntrinsicLibrary::genBacktrace(llvm::ArrayRef<fir::ExtendedValue> args) {
- assert(args.size() == 0);
- fir::runtime::genBacktrace(builder, loc);
-}
-
// BESSEL_YN
fir::ExtendedValue
IntrinsicLibrary::genBesselYn(mlir::Type resultType,
diff --git a/flang/lib/Optimizer/Builder/Runtime/Stop.cpp b/flang/lib/Optimizer/Builder/Runtime/Stop.cpp
index 541e5f3b5d11a8..411181cc6dd1ca 100644
--- a/flang/lib/Optimizer/Builder/Runtime/Stop.cpp
+++ b/flang/lib/Optimizer/Builder/Runtime/Stop.cpp
@@ -28,13 +28,6 @@ void fir::runtime::genAbort(fir::FirOpBuilder &builder, mlir::Location loc) {
builder.create<fir::CallOp>(loc, abortFunc, std::nullopt);
}
-void fir::runtime::genBacktrace(fir::FirOpBuilder &builder,
- mlir::Location loc) {
- mlir::func::FuncOp backtraceFunc =
- fir::runtime::getRuntimeFunc<mkRTKey(Backtrace)>(loc, builder);
- builder.create<fir::CallOp>(loc, backtraceFunc, std::nullopt);
-}
-
void fir::runtime::genReportFatalUserError(fir::FirOpBuilder &builder,
mlir::Location loc,
llvm::StringRef message) {
diff --git a/flang/runtime/stop.cpp b/flang/runtime/stop.cpp
index 17d0ca661d9e84..cfb36b40840200 100644
--- a/flang/runtime/stop.cpp
+++ b/flang/runtime/stop.cpp
@@ -16,11 +16,6 @@
#include <cstdio>
#include <cstdlib>
-#include "llvm/Config/config.h"
-#ifdef HAVE_BACKTRACE
-#include BACKTRACE_HEADER
-#endif
-
extern "C" {
static void DescribeIEEESignaledExceptions() {
@@ -157,36 +152,11 @@ void RTNAME(PauseStatementText)(const char *code, std::size_t length) {
std::exit(status);
}
-static void PrintBacktrace() {
-#ifdef HAVE_BACKTRACE
- // TODO: Need to parse DWARF information to print function line numbers
- constexpr int MAX_CALL_STACK{999};
- void *buffer[MAX_CALL_STACK];
- int nptrs{backtrace(buffer, MAX_CALL_STACK)};
-
- if (char **symbols{backtrace_symbols(buffer, nptrs)}) {
- for (int i = 0; i < nptrs; i++) {
- Fortran::runtime::Terminator{}.PrintCrashArgs("#%d %s\n", i, symbols[i]);
- }
- free(symbols);
- }
-
-#else
-
- // TODO: Need to implement the version for other platforms.
- Fortran::runtime::Terminator{}.PrintCrashArgs(
- "Handle the case when a backtrace is not available");
-
-#endif
-}
-
[[noreturn]] void RTNAME(Abort)() {
- PrintBacktrace();
+ // TODO: Add backtrace call, unless with `-fno-backtrace`.
std::abort();
}
-void RTNAME(Backtrace)() { PrintBacktrace(); }
-
[[noreturn]] void RTNAME(ReportFatalUserError)(
const char *message, const char *source, int line) {
Fortran::runtime::Terminator{source, line}.Crash(message);
diff --git a/flang/test/Lower/Intrinsics/backtrace.f90 b/flang/test/Lower/Intrinsics/backtrace.f90
deleted file mode 100644
index 9d5e7b4965baff..00000000000000
--- a/flang/test/Lower/Intrinsics/backtrace.f90
+++ /dev/null
@@ -1,10 +0,0 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
-
-! CHECK-LABEL: func.func @_QPbacktrace_test() {
-! CHECK: %[[VAL_0:.*]] = fir.call @_FortranABacktrace() {{.*}}: () -> none
-! CHECK: return
-! CHECK: }
-
-subroutine backtrace_test()
- call backtrace
-end subroutine
More information about the llvm-branch-commits
mailing list