Skip to content

Commit 716dd45

Browse files
committed
bugfix: Fix one invocation after conflicts in a PR
1 parent 852f99c commit 716dd45

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ jobs:
773773
WORKFLOW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
774774
with:
775775
filename: .github/workflows/issue_nightly_failed.md
776-
776+
build-sdk-package:
777777
uses: ./.github/workflows/build-sdk.yml
778778
if:
779779
(github.event_name == 'pull_request' && !contains(github.event.pull_request.body, '[skip ci]')) ||

compiler/src/dotty/tools/dotc/ast/tpd.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
11671167
* recursion in the self type.
11681168
*/
11691169
def ensureHasSym(sym: Symbol)(using Context): Unit =
1170-
if sym.exists && sym != tree.symbol then
1170+
if sym.exists && sym != tree.symbol && sym.isTerm then
11711171
typr.println(i"correcting definition symbol from ${tree.symbol.showLocated} to ${sym.showLocated}")
11721172
tree.overwriteType(NamedType(sym.owner.thisType, sym.asTerm.name, sym.denot))
11731173

compiler/src/dotty/tools/dotc/typer/Typer.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2501,7 +2501,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
25012501
case rhs => typedExpr(rhs, tpt1.tpe.widenExpr)
25022502
}
25032503
val vdef1 = assignType(cpy.ValDef(vdef)(name, tpt1, rhs1), sym)
2504-
postProcessInfo(sym)
2504+
postProcessInfo(vdef1, sym)
25052505
vdef1.setDefTree
25062506
}
25072507

0 commit comments

Comments
 (0)