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

Jump to bottom

Verify tmp registers #1010

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open

Verify tmp registers #1010

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4d7932a
Verify register kinds
ushirask May 9, 2022
11f3509
Rename function
ushirask May 9, 2022
9318029
make variables private
ushirask May 13, 2022
753c457
Merge branch 'ballerina-platform:main' into 995_register
ushirask May 13, 2022
abdbf53
fix conflicts
ushirask May 13, 2022
3a4c0df
Refactor code
ushirask May 18, 2022
8eba31b
Merge branch 'ballerina-platform:main' into 995_register
ushirask May 18, 2022
f2a1382
Refactor code
ushirask May 19, 2022
e2ec714
Use match statment
ushirask May 19, 2022
d6879e7
Remove unused param
ushirask May 19, 2022
4d12ef0
Refactor code
ushirask May 19, 2022
54ce38f
Refactor code
ushirask May 19, 2022
87e1184
Refactor code
ushirask May 19, 2022
0b1638e
Rename to tmpRegisterInit
ushirask May 19, 2022
06d93f7
Rename function
ushirask May 19, 2022
d16e0b2
Rename param
ushirask May 19, 2022
a5b3a3f
Remove incorrect verification
ushirask May 20, 2022
9546bee
Remove incorrect verification
ushirask May 20, 2022
82cfbb3
Move TypeMerge/Branch checks
ushirask May 23, 2022
59b6c9f
Fix match stmt assign tmp
ushirask May 25, 2022
88838a1
Fix foreach stmt assign tmp
ushirask May 25, 2022
2895ca3
Remove tmp register read check
ushirask May 26, 2022
f264fd5
Remove unused function
ushirask May 26, 2022
029c548
Rename function
ushirask May 26, 2022
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
10 changes: 10 additions & 0 deletions compiler/modules/front/stmt.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ class StmtContext {
return bir:createTmpRegister(self.code, t, pos);
}

function createAssignTmpRegister(bir:SemType t, Position? pos = ()) returns bir:AssignTmpRegister {
return bir:createAssignTmpRegister(self.code, t, pos);
}

function nextRegisterNumber() returns int {
return self.code.registers.length();
}
Expand Down Expand Up @@ -699,6 +703,12 @@ function codeGenMatchStmt(StmtContext cx, bir:BasicBlock startBlock, Environment
else {
// Match expression is not a variable: we do not get type narrowing
int patternIndex = 0;
if matched is bir:TmpRegister {
bir:AssignTmpRegister result = cx.createAssignTmpRegister(matched.semType, matched.pos);
bir:AssignInsn insn = { result, operand: matched, pos : stmt.startPos };
matched = result;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In a match we are only reading matched, aren't we ? why do we need AssignTmpRegister?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In a case like

match x + 1 {
    2 => { 
        return "1";
    }
    4 => {
        return "2";
    }
}

even though matched is a TmpRegister it will be used in multiple blocks for Equality instructions, so to avoid that I think we can either do something like this or change all expr code gens to create AssignTmpRegister instead of Tmp depending on the situation.

Copy link
Contributor

@manuranga manuranga May 25, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we'll have to change the definition of TmpRegister to, assigned once, but can be used form multiple blocks.
@jclark what do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this is already the case, the problem is when the TmpRegister is used in a different block than the block it was initially assigned.

Copy link
Contributor

@manuranga manuranga May 25, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but can be used multiple times

I meant

but can be used from multiple block

let me edit.

testBlock.insns.push(insn);
}
foreach var mt in matchTests {
int clauseIndex = mt.clauseIndex;
if clauseIndex == defaultClauseIndex {
Expand Down