Skip to content

Commit 10f512f

Browse files
authored
Revert runtime work queue patch, it breaks some tests that need investigation (#143713)
Revert "[flang][runtime] Another try to fix build failure" This reverts commit 13869ca. Revert "[flang][runtime] Fix build bot flang-runtime-cuda-gcc errors (#143650)" This reverts commit d75e284. Revert "[flang][runtime] Replace recursion with iterative work queue (#137727)" This reverts commit 163c67a.
1 parent 4e44166 commit 10f512f

31 files changed

+1120
-2231
lines changed

flang-rt/include/flang-rt/runtime/environment.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ struct ExecutionEnvironment {
6464
bool defaultUTF8{false}; // DEFAULT_UTF8
6565
bool checkPointerDeallocation{true}; // FORT_CHECK_POINTER_DEALLOCATION
6666

67-
enum InternalDebugging { WorkQueue = 1 };
68-
int internalDebugging{0}; // FLANG_RT_DEBUG
69-
7067
// CUDA related variables
7168
std::size_t cudaStackLimit{0}; // ACC_OFFLOAD_STACK_SIZE
7269
bool cudaDeviceIsManaged{false}; // NV_CUDAFOR_DEVICE_IS_MANAGED

flang-rt/include/flang-rt/runtime/stat.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Terminator;
2424
enum Stat {
2525
StatOk = 0, // required to be zero by Fortran
2626

27-
// Interoperable STAT= codes (>= 11)
27+
// Interoperable STAT= codes
2828
StatBaseNull = CFI_ERROR_BASE_ADDR_NULL,
2929
StatBaseNotNull = CFI_ERROR_BASE_ADDR_NOT_NULL,
3030
StatInvalidElemLen = CFI_INVALID_ELEM_LEN,
@@ -36,7 +36,7 @@ enum Stat {
3636
StatMemAllocation = CFI_ERROR_MEM_ALLOCATION,
3737
StatOutOfBounds = CFI_ERROR_OUT_OF_BOUNDS,
3838

39-
// Standard STAT= values (>= 101)
39+
// Standard STAT= values
4040
StatFailedImage = FORTRAN_RUNTIME_STAT_FAILED_IMAGE,
4141
StatLocked = FORTRAN_RUNTIME_STAT_LOCKED,
4242
StatLockedOtherImage = FORTRAN_RUNTIME_STAT_LOCKED_OTHER_IMAGE,
@@ -49,14 +49,10 @@ enum Stat {
4949
// Additional "processor-defined" STAT= values
5050
StatInvalidArgumentNumber = FORTRAN_RUNTIME_STAT_INVALID_ARG_NUMBER,
5151
StatMissingArgument = FORTRAN_RUNTIME_STAT_MISSING_ARG,
52-
StatValueTooShort = FORTRAN_RUNTIME_STAT_VALUE_TOO_SHORT, // -1
52+
StatValueTooShort = FORTRAN_RUNTIME_STAT_VALUE_TOO_SHORT,
5353
StatMoveAllocSameAllocatable =
5454
FORTRAN_RUNTIME_STAT_MOVE_ALLOC_SAME_ALLOCATABLE,
5555
StatBadPointerDeallocation = FORTRAN_RUNTIME_STAT_BAD_POINTER_DEALLOCATION,
56-
57-
// Dummy status for work queue continuation, declared here to perhaps
58-
// avoid collisions
59-
StatContinue = 201
6056
};
6157

6258
RT_API_ATTRS const char *StatErrorString(int);

flang-rt/include/flang-rt/runtime/type-info.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@ class DerivedType {
240240
RT_API_ATTRS bool noFinalizationNeeded() const {
241241
return noFinalizationNeeded_;
242242
}
243-
RT_API_ATTRS bool noDefinedAssignment() const { return noDefinedAssignment_; }
244243

245244
RT_API_ATTRS std::size_t LenParameters() const {
246245
return lenParameterKind().Elements();
@@ -323,7 +322,6 @@ class DerivedType {
323322
bool noInitializationNeeded_{false};
324323
bool noDestructionNeeded_{false};
325324
bool noFinalizationNeeded_{false};
326-
bool noDefinedAssignment_{false};
327325
};
328326

329327
} // namespace Fortran::runtime::typeInfo

0 commit comments

Comments
 (0)