Merge pull request #22843 from nkcsgexi/48290050

nkcsgexi · web-flow · commit 9fae178a5eed · 2019-02-25T14:13:19.000-08:00
refactoring: add a defensive check for nullptr.
diff --git a/lib/IDE/Refactoring.cpp b/lib/IDE/Refactoring.cpp
@@ -1909,8 +1909,7 @@ class ExpandableAssignTernaryExprInfo: public ExpandableTernaryExprInfo {
   IfExpr *getIf() {
     if (!Assign)
       return nullptr;
-
-    return dyn_cast<IfExpr>(Assign->getSrc());
+    return dyn_cast_or_null<IfExpr>(Assign->getSrc());
   }
 
   SourceRange getNameRange() {

Original file line number	Diff line number	Diff line change
`@@ -1909,8 +1909,7 @@ class ExpandableAssignTernaryExprInfo: public ExpandableTernaryExprInfo {`
`1909`	`1909`	`IfExpr *getIf() {`
`1910`	`1910`	`if (!Assign)`
`1911`	`1911`	`return nullptr;`
`1912`		`-`
`1913`		`- return dyn_cast<IfExpr>(Assign->getSrc());`
	`1912`	`+ return dyn_cast_or_null<IfExpr>(Assign->getSrc());`
`1914`	`1913`	`}`
`1915`	`1914`
`1916`	`1915`	`SourceRange getNameRange() {`