diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
index d40b4b4dbb560..0f0aaa0e1902b 100644
--- a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
@@ -589,6 +589,19 @@ class TrivialFunctionAnalysisVisitor
     return Visit(BTE->getSubExpr());
   }
 
+  bool VisitArrayInitLoopExpr(const ArrayInitLoopExpr *AILE) {
+    return Visit(AILE->getCommonExpr()) && Visit(AILE->getSubExpr());
+  }
+
+  bool VisitArrayInitIndexExpr(const ArrayInitIndexExpr *AIIE) {
+    return true; // The current array index in VisitArrayInitLoopExpr is always
+                 // trivial.
+  }
+
+  bool VisitOpaqueValueExpr(const OpaqueValueExpr *OVE) {
+    return Visit(OVE->getSourceExpr());
+  }
+
   bool VisitExprWithCleanups(const ExprWithCleanups *EWC) {
     return Visit(EWC->getSubExpr());
   }
diff --git a/clang/test/Analysis/Checkers/WebKit/call-args-loop-init-opaque-value.cpp b/clang/test/Analysis/Checkers/WebKit/call-args-loop-init-opaque-value.cpp
new file mode 100644
index 0000000000000..8fa10306c20f3
--- /dev/null
+++ b/clang/test/Analysis/Checkers/WebKit/call-args-loop-init-opaque-value.cpp
@@ -0,0 +1,64 @@
+// RUN: %clang_analyze_cc1 -analyzer-checker=alpha.webkit.UncountedCallArgsChecker -verify %s
+
+typedef unsigned long size_t;
+template<typename T, size_t N>
+struct Obj {
+    constexpr static size_t Size = N;
+
+    constexpr T& operator[](size_t i) { return components[i]; }
+    constexpr const T& operator[](size_t i) const { return components[i]; }
+
+    constexpr size_t size() const { return Size; }
+
+    T components[N];
+};
+
+template<typename T, size_t N>
+constexpr bool operator==(const Obj<T, N>& a, const Obj<T, N>& b)
+{
+    for (size_t i = 0; i < N; ++i) {
+        if (a[i] == b[i])
+            continue;
+        return false;
+    }
+
+    return true;
+}
+
+struct NonTrivial {
+  NonTrivial();
+  NonTrivial(const NonTrivial&);
+  bool operator==(const NonTrivial& other) const { return value == other.value; }
+  float value;
+};
+
+class Component {
+public:
+    void ref() const;
+    void deref() const;
+
+    Obj<float, 4> unresolvedComponents() const { return m_components; }
+    Obj<NonTrivial, 4> unresolvedNonTrivialComponents() const { return m_nonTrivialComponents; }
+
+    bool isEqual(const Component& other) const {
+        return unresolvedComponents() == other.unresolvedComponents();
+    }
+
+    bool isNonTrivialEqual(const Component& other) const {
+        return unresolvedNonTrivialComponents() == other.unresolvedNonTrivialComponents();
+    }
+
+private:
+    Obj<float, 4> m_components;
+    Obj<NonTrivial, 4> m_nonTrivialComponents;
+};
+
+Component* provide();
+bool someFunction(Component* other) {
+    return provide()->isEqual(*other);
+}
+
+bool otherFunction(Component* other) {
+    return provide()->isNonTrivialEqual(*other);
+    // expected-warning@-1{{Call argument for 'this' parameter is uncounted and unsafe}}
+}