summaryrefslogtreecommitdiff
path: root/flang/runtime/namelist.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'flang/runtime/namelist.cpp')
-rw-r--r--flang/runtime/namelist.cpp15
1 files changed, 2 insertions, 13 deletions
diff --git a/flang/runtime/namelist.cpp b/flang/runtime/namelist.cpp
index 71d6388a7f89..1b3207ef2f93 100644
--- a/flang/runtime/namelist.cpp
+++ b/flang/runtime/namelist.cpp
@@ -6,11 +6,6 @@
//
//===----------------------------------------------------------------------===//
-// TODO: When lowering has been updated to used the new pointer data member in
-// the NamelistGroup structure, delete this definition and the two #ifndef
-// directives below that test it.
-#define DISABLE_NON_TBP_DIO 1
-
#include "namelist.h"
#include "descriptor-io.h"
#include "emit-encoded.h"
@@ -73,10 +68,7 @@ bool IONAME(OutputNamelist)(Cookie cookie, const NamelistGroup &group) {
}
if (const auto *addendum{item.descriptor.Addendum()};
addendum && addendum->derivedType()) {
- NonTbpDefinedIoTable *table{nullptr};
-#ifndef DISABLE_NON_TBP_DIO
- table = group.nonTbpDefinedIo;
-#endif
+ const NonTbpDefinedIoTable *table{group.nonTbpDefinedIo};
if (!IONAME(OutputDerivedType)(cookie, item.descriptor, table)) {
return false;
}
@@ -533,10 +525,7 @@ bool IONAME(InputNamelist)(Cookie cookie, const NamelistGroup &group) {
listInput->ResetForNextNamelistItem(useDescriptor->rank() > 0);
if (const auto *addendum{useDescriptor->Addendum()};
addendum && addendum->derivedType()) {
- NonTbpDefinedIoTable *table{nullptr};
-#ifndef DISABLE_NON_TBP_DIO
- table = group.nonTbpDefinedIo;
-#endif
+ const NonTbpDefinedIoTable *table{group.nonTbpDefinedIo};
if (!IONAME(InputDerivedType)(cookie, *useDescriptor, table)) {
return false;
}