[flang-commits] [flang] 81bd5e2 - Revert "[flang][NFC] Switch CollectBindings return to SymbolVector"
Valentin Clement via flang-commits
flang-commits at lists.llvm.org
Tue Nov 22 01:12:24 PST 2022
Author: Valentin Clement
Date: 2022-11-22T10:12:14+01:00
New Revision: 81bd5e2ef7332f8ccad5ffeef931ed7d87d548e7
URL: https://github.com/llvm/llvm-project/commit/81bd5e2ef7332f8ccad5ffeef931ed7d87d548e7
DIFF: https://github.com/llvm/llvm-project/commit/81bd5e2ef7332f8ccad5ffeef931ed7d87d548e7.diff
LOG: Revert "[flang][NFC] Switch CollectBindings return to SymbolVector"
This reverts commit 97e8eeb758fcae4f2afd9ac516ffc9509b4daaf0.
Added:
Modified:
flang/include/flang/Semantics/runtime-type-info.h
flang/lib/Lower/Bridge.cpp
flang/lib/Semantics/runtime-type-info.cpp
Removed:
################################################################################
diff --git a/flang/include/flang/Semantics/runtime-type-info.h b/flang/include/flang/Semantics/runtime-type-info.h
index 76560b98b1c20..4bb93c8e5069b 100644
--- a/flang/include/flang/Semantics/runtime-type-info.h
+++ b/flang/include/flang/Semantics/runtime-type-info.h
@@ -14,7 +14,6 @@
#ifndef FORTRAN_SEMANTICS_RUNTIME_TYPE_INFO_H_
#define FORTRAN_SEMANTICS_RUNTIME_TYPE_INFO_H_
-#include "flang/Common/reference.h"
#include <set>
#include <string>
#include <vector>
@@ -28,9 +27,6 @@ class Scope;
class SemanticsContext;
class Symbol;
-using SymbolRef = common::Reference<const Symbol>;
-using SymbolVector = std::vector<SymbolRef>;
-
struct RuntimeDerivedTypeTables {
Scope *schemata{nullptr};
std::set<std::string> names;
@@ -42,7 +38,7 @@ RuntimeDerivedTypeTables BuildRuntimeDerivedTypeTables(SemanticsContext &);
/// to describe other derived types at runtime in flang descriptor.
constexpr char typeInfoBuiltinModule[]{"__fortran_type_info"};
-SymbolVector CollectBindings(const Scope &dtScope);
+std::vector<const Symbol *> CollectBindings(const Scope &dtScope);
} // namespace Fortran::semantics
#endif // FORTRAN_SEMANTICS_RUNTIME_TYPE_INFO_H_
diff --git a/flang/lib/Lower/Bridge.cpp b/flang/lib/Lower/Bridge.cpp
index f17f0f8bd1959..5d8be0390ca87 100644
--- a/flang/lib/Lower/Bridge.cpp
+++ b/flang/lib/Lower/Bridge.cpp
@@ -223,21 +223,21 @@ class DispatchTableConverter {
parent ? Fortran::lower::mangle::mangleName(*parent) : "");
auto insertPt = builder.saveInsertionPoint();
- Fortran::semantics::SymbolVector bindings =
+ std::vector<const Fortran::semantics::Symbol *> bindings =
Fortran::semantics::CollectBindings(*info.typeSpec->scope());
if (!bindings.empty())
builder.createBlock(&dt.getRegion());
- for (const Fortran::semantics::SymbolRef binding : bindings) {
+ for (const Fortran::semantics::Symbol *binding : bindings) {
const auto *details =
- binding.get().detailsIf<Fortran::semantics::ProcBindingDetails>();
+ binding->detailsIf<Fortran::semantics::ProcBindingDetails>();
std::string bindingName =
Fortran::lower::mangle::mangleName(details->symbol());
builder.create<fir::DTEntryOp>(
info.loc,
mlir::StringAttr::get(builder.getContext(),
- binding.get().name().ToString()),
+ binding->name().ToString()),
mlir::SymbolRefAttr::get(builder.getContext(), bindingName));
}
if (!bindings.empty())
diff --git a/flang/lib/Semantics/runtime-type-info.cpp b/flang/lib/Semantics/runtime-type-info.cpp
index f0e2c8b1413a9..a3877e776bdc8 100644
--- a/flang/lib/Semantics/runtime-type-info.cpp
+++ b/flang/lib/Semantics/runtime-type-info.cpp
@@ -940,8 +940,8 @@ SomeExpr RuntimeTableBuilder::PackageIntValueExpr(
return StructureExpr(PackageIntValue(genre, n));
}
-SymbolVector CollectBindings(const Scope &dtScope) {
- SymbolVector result;
+std::vector<const Symbol *> CollectBindings(const Scope &dtScope) {
+ std::vector<const Symbol *> result;
std::map<SourceName, const Symbol *> localBindings;
// Collect local bindings
for (auto pair : dtScope) {
@@ -957,14 +957,14 @@ SymbolVector CollectBindings(const Scope &dtScope) {
const Symbol &symbol{**iter};
auto overridden{localBindings.find(symbol.name())};
if (overridden != localBindings.end()) {
- *iter = *overridden->second;
+ *iter = overridden->second;
localBindings.erase(overridden);
}
}
}
// Add remaining (non-overriding) local bindings in name order to the result
for (auto pair : localBindings) {
- result.push_back(*pair.second);
+ result.push_back(pair.second);
}
return result;
}
@@ -972,13 +972,13 @@ SymbolVector CollectBindings(const Scope &dtScope) {
std::vector<evaluate::StructureConstructor>
RuntimeTableBuilder::DescribeBindings(const Scope &dtScope, Scope &scope) {
std::vector<evaluate::StructureConstructor> result;
- for (const SymbolRef ref : CollectBindings(dtScope)) {
+ for (const Symbol *symbol : CollectBindings(dtScope)) {
evaluate::StructureConstructorValues values;
AddValue(values, bindingSchema_, "proc"s,
SomeExpr{evaluate::ProcedureDesignator{
- ref.get().get<ProcBindingDetails>().symbol()}});
+ symbol->get<ProcBindingDetails>().symbol()}});
AddValue(values, bindingSchema_, "name"s,
- SaveNameAsPointerTarget(scope, ref.get().name().ToString()));
+ SaveNameAsPointerTarget(scope, symbol->name().ToString()));
result.emplace_back(DEREF(bindingSchema_.AsDerived()), std::move(values));
}
return result;
More information about the flang-commits
mailing list