maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[flang] checkpoint 

Original-commit: flang-compiler/f18@1e213f3fbe
Reviewed-on: https://github.com/flang-compiler/f18/pull/346
Tree-same-pre-rewrite: false
This commit is contained in:
peter klausler 2019-03-20 13:11:49 -07:00
parent afd0c19fec
commit c090abef3b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flang/lib/evaluate/characteristics.cc
View File

@ -61,8 +61,8 @@ bool DummyProcedure::operator==(const DummyProcedure &that) const {
std::ostream &DummyProcedure::Dump(std::ostream &o) const { std::ostream &DummyProcedure::Dump(std::ostream &o) const {
attrs.Dump(o, EnumToString); attrs.Dump(o, EnumToString);
if (explicitProcedure.has_value()) { if (explicitProcedure) {
explicitProcedure.value().Dump(o); explicitProcedure->Dump(o);
} }
return o; return o;
} }
@ -98,5 +98,6 @@ std::ostream &Procedure::Dump(std::ostream &o) const {
} }
return o << (sep == '(' ? "()" : ")"); return o << (sep == '(' ? "()" : ")");
} }
DEFINE_DEFAULT_CONSTRUCTORS_AND_ASSIGNMENTS(DummyProcedure)
} }
DEFINE_DELETER(Fortran::evaluate::characteristics::Procedure) DEFINE_DELETER(Fortran::evaluate::characteristics::Procedure)

2
flang/lib/evaluate/characteristics.h
View File

@ -53,7 +53,7 @@ struct DummyDataObject {
// 15.3.2.3 // 15.3.2.3
struct DummyProcedure { struct DummyProcedure {
ENUM_CLASS(Attr, Pointer, Optional) ENUM_CLASS(Attr, Pointer, Optional)
DEFAULT_CONSTRUCTORS_AND_ASSIGNMENTS(DummyProcedure) DECLARE_CONSTRUCTORS_AND_ASSIGNMENTS(DummyProcedure)
std::unique_ptr<Procedure, common::Deleter<Procedure>> explicitProcedure; std::unique_ptr<Procedure, common::Deleter<Procedure>> explicitProcedure;
common::EnumSet<Attr, 32> attrs; common::EnumSet<Attr, 32> attrs;
bool operator==(const DummyProcedure &) const; bool operator==(const DummyProcedure &) const;