Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/Change llvm parsing order to support metadata referencing globals #778

Closed
wants to merge 3 commits into from
Closed

Fix/Change llvm parsing order to support metadata referencing globals #778

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8772b56
Change parsing order to allow metadata to refer to program constants.
ThomasHaas Nov 11, 2024
23fa26b
Removed debugging code
ThomasHaas Nov 11, 2024
29f91d9
Merge branch 'refs/heads/development' into fixLlvmParsingOrder
ThomasHaas Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions dartagnan/src/main/java/com/dat3m/dartagnan/parsers/program/visitors/VisitorLlvm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,8 @@ public Program buildProgram() {

@Override
public Expression visitCompilationUnit(CompilationUnitContext ctx) {
// Create the metadata mapping beforehand, so that instructions can get all attachments.
// Also parse all type definitions.
// Define types
for (final TopLevelEntityContext entity : ctx.topLevelEntity()) {
if (entity.metadataDef() != null) {
entity.accept(this);
}
if (entity.typeDef() != null) {
entity.accept(this);
}
Expand All @@ -96,14 +92,21 @@ public Expression visitCompilationUnit(CompilationUnitContext ctx) {
}
}

// Parse global definitions after declarations.
// Create the metadata mapping beforehand, so that instructions can get all attachments.
for (final TopLevelEntityContext entity : ctx.topLevelEntity()) {
if (entity.metadataDef() != null) {
entity.accept(this);
}
}

// Parse global definitions.
for (final TopLevelEntityContext entity : ctx.topLevelEntity()) {
if (entity.globalDef() != null) {
visitGlobalDef(entity.globalDef());
}
}

// Parse definitions
// Parse remaining definitions (~ function bodies).
for (final TopLevelEntityContext entity : ctx.topLevelEntity()) {
if (entity.metadataDef() == null &&
entity.globalDef() == null &&
Expand Down
Loading