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

Adds special treatment for Predef.classOf in object initialization checker #20945

Closed
wants to merge 1 commit into from
Closed

Adds special treatment for Predef.classOf in object initialization checker #20945

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 16 additions & 8 deletions compiler/src/dotty/tools/dotc/transform/init/Objects.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ class Objects(using Context @constructorOnly):

val whiteList: Set[Symbol] = Set(SetNode_EmptySetNode, HashSet_EmptySet, Vector_EmptyIterator, MapNode_EmptyMapNode, HashMap_EmptyMap, LazyList_empty)

val ignoreMethodsWhitelist: Set[Symbol] = Set(defn.Predef_classOf)

// ----------------------------- abstract domain -----------------------------

/** Syntax for the data structure abstraction used in abstract domain:
Expand Down Expand Up @@ -1162,11 +1164,14 @@ class Objects(using Context @constructorOnly):
withTrace(trace2) { call(thisValue2, ref.symbol, args, thisTp, superTp) }

case Select(qual, _) =>
val receiver = eval(qual, thisV, klass)
if ref.symbol.isConstructor then
withTrace(trace2) { callConstructor(receiver, ref.symbol, args) }
if ignoreMethodsWhitelist.contains(ref.symbol) then
Bottom
else
withTrace(trace2) { call(receiver, ref.symbol, args, receiver = qual.tpe, superType = NoType) }
val receiver = eval(qual, thisV, klass)
if ref.symbol.isConstructor then
withTrace(trace2) { callConstructor(receiver, ref.symbol, args) }
else
withTrace(trace2) { call(receiver, ref.symbol, args, receiver = qual.tpe, superType = NoType) }

case id: Ident =>
id.tpe match
Expand All @@ -1177,11 +1182,14 @@ class Objects(using Context @constructorOnly):
// local methods are not a member, but we can reuse the method `call`
withTrace(trace2) { call(thisValue2, id.symbol, args, receiver = NoType, superType = NoType, needResolve = false) }
case TermRef(prefix, _) =>
val receiver = withTrace(trace2) { evalType(prefix, thisV, klass) }
if id.symbol.isConstructor then
withTrace(trace2) { callConstructor(receiver, id.symbol, args) }
if ignoreMethodsWhitelist.contains(ref.symbol) then
Bottom
else
withTrace(trace2) { call(receiver, id.symbol, args, receiver = prefix, superType = NoType) }
val receiver = withTrace(trace2) { evalType(prefix, thisV, klass) }
if id.symbol.isConstructor then
withTrace(trace2) { callConstructor(receiver, id.symbol, args) }
else
withTrace(trace2) { call(receiver, id.symbol, args, receiver = prefix, superType = NoType) }

case Select(qualifier, name) =>
val qual = eval(qualifier, thisV, klass)
Expand Down
Loading