From c901ca7441238a40a7a0a50c5bc09faf6a27c84a Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Mon, 17 Feb 2025 16:26:13 +0100 Subject: [PATCH] bugfix: Fix one invocation after conflicts in a PR --- .github/workflows/ci.yaml | 2 +- compiler/src/dotty/tools/dotc/typer/Typer.scala | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bb8927c1ded1..191f993966cc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -773,7 +773,7 @@ jobs: WORKFLOW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} with: filename: .github/workflows/issue_nightly_failed.md - + build-sdk-package: uses: ./.github/workflows/build-sdk.yml if: (github.event_name == 'pull_request' && !contains(github.event.pull_request.body, '[skip ci]')) || diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index c46b39a1836b..358c50fe0a97 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -2501,8 +2501,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer case rhs => typedExpr(rhs, tpt1.tpe.widenExpr) } val vdef1 = assignType(cpy.ValDef(vdef)(name, tpt1, rhs1), sym) - postProcessInfo(sym) - vdef1.setDefTree + postProcessInfo(vdef1, sym) } private def retractDefDef(sym: Symbol)(using Context): Tree =