Skip to content

Commit af54b31

Browse files
committed
Fix upstream fn signature change
1 parent 142c79c commit af54b31

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

clang/include/clang/Analysis/FlowSensitive/Models/NullPointerAnalysisModel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class NullPointerAnalysisModel
7171
const Environment &Env1, const Value &Val2,
7272
const Environment &Env2) override;
7373

74-
Value *widen(QualType Type, Value &Prev, const Environment &PrevEnv,
74+
std::optional<WidenResult> widen(QualType Type, Value &Prev, const Environment &PrevEnv,
7575
Value &Current, Environment &CurrentEnv) override;
7676
};
7777

clang/lib/Analysis/FlowSensitive/Models/NullPointerAnalysisModel.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -668,20 +668,20 @@ ComparisonResult compareAndReplace(QualType Type, Value &Val1,
668668
return ComparisonResult::Same;
669669
}
670670

671-
Value *NullPointerAnalysisModel::widen(QualType Type, Value &Prev,
671+
std::optional<WidenResult> NullPointerAnalysisModel::widen(QualType Type, Value &Prev,
672672
const Environment &PrevEnv,
673673
Value &Current,
674674
Environment &CurrentEnv) {
675675
if (!Type->isAnyPointerType())
676-
return nullptr;
676+
return std::nullopt;
677677

678678
switch (compareAndReplace(Type, Prev, PrevEnv, Current, CurrentEnv)) {
679679
case ComparisonResult::Same:
680-
return &Prev;
680+
return WidenResult{&Prev, LatticeEffect::Unchanged};
681681
case ComparisonResult::Unknown:
682-
return nullptr;
682+
return std::nullopt;
683683
case ComparisonResult::Different:
684-
return &Current;
684+
return WidenResult{&Current, LatticeEffect::Changed};
685685
}
686686
}
687687

0 commit comments

Comments
 (0)