More progress on uncurry level removal #12785
Conversation
|
@swift-ci Please smoke test |
|
@gottesmm You might want to take a quick look at this one. Just mechanical changes, no effect on generated SIL. |
| @@ -1327,7 +1327,7 @@ bool SILParser::parseSILDeclRef(SILDeclRef &Result, | |||
|
|
|||
| // Construct SILDeclRef. | |||
| Result = SILDeclRef(VD, Kind, expansion, /*isCurried=*/false, IsObjC); | |||
| if (uncurryLevel < Result.getUncurryLevel()) | |||
| if (uncurryLevel < Result.getParameterListCount() - 1) | |||
There was a problem hiding this comment.
Instead of using a constant - 1 here, can you turn this into a method on Result with a descriptive name/comment.
| if (kind == Kind::DefaultArgGenerator) | ||
| return 0; | ||
| return getNaturalUncurryLevel(getDecl()); | ||
| unsigned SILDeclRef::getParameterListCount() const { |
There was a problem hiding this comment.
Can you add more documentation here and use early-exits instead of else-if return?
What I want is for each case to say /why/ it has X amounts of parameters. For instance, why does ClassDecl have 2 parameters? It would also be nice to have a bigger comment explaining this methods use/importance in the larger world of SIL.
| @@ -1777,7 +1777,7 @@ static bool isImporterGeneratedAccessor(const clang::Decl *clangDecl, | |||
| return false; | |||
|
|
|||
| // Must be a type member. | |||
| if (constant.getUncurryLevel() != 1) | |||
| if (constant.getParameterListCount() != 2) | |||
There was a problem hiding this comment.
Can you add a comment here why you are checking against 2? Couldn't this be a method on SILDeclRef with a nice comment that explains what is happening here?
Almost gone!