Fix subscript reconstruction #15096
Fix subscript reconstruction #15096
Conversation
Fixes part of <rdar://problem/36132173>.
Mostly fixes the rest of <rdar://problem/36132173>, but we still need to correctly reconstruct dependent member types. That's no longer related to the original problem of subscripts not working though.
|
@dcci Here are the changes we discussed |
|
@swift-ci Please test |
| back_inserter(identifier_result._types)); | ||
| identifier_result._module = decl_scope_result._module; | ||
| if (decl_scope_result._decls.size() == 1) | ||
| found_univocous = true; |
There was a problem hiding this comment.
This is only used to break out of the earlier loop, right?
There was a problem hiding this comment.
I’m just cargo culting the rest of the code in this function. Not sure I want to spend much time cleaning it up since most of it is going away soon.
There was a problem hiding this comment.
In that case cargo-cult away, sir!
| if (decl_scope_result._decls.empty()) { | ||
| result._error = stringWithFormat( | ||
| "subscript identifier could not be found by name lookup"); | ||
| break; |
There was a problem hiding this comment.
If we get to this point do we really want to continue on to the code at line 1303?
| @@ -1451,6 +1494,11 @@ static void VisitNodeSetterGetter( | |||
| } | |||
| } | |||
|
|
|||
| if (!type_result.HasSingleType()) { | |||
| result._error = "bad type"; | |||
There was a problem hiding this comment.
Do we have a testcase for this case/diagnostic?
There was a problem hiding this comment.
No. These are invalid cases that should never come up (but maybe if your swiftmodule doesn’t match your debuginfo or something? I don’t know)
There was a problem hiding this comment.
I don't think we should worry too much (if we'll ever run across a case where this happens, we can consider adding a test), in particular considering that, as you say, this code might go away in the next while.
Fixes rdar://problem/36132173.