Index: lib/Sema/SemaExpr.cpp
===================================================================
--- lib/Sema/SemaExpr.cpp	(revision 190028)
+++ lib/Sema/SemaExpr.cpp	(working copy)
@@ -8400,6 +8400,9 @@
                                           IsInc, IsPrefix);
   } else if (S.getLangOpts().AltiVec && ResType->isVectorType()) {
     // OK! ( C/C++ Language Extensions for CBEA(Version 2.6) 10.3 )
+  } else if(S.getLangOpts().OpenCL && ResType->isVectorType() &&
+            ResType->getAs<VectorType>()->getElementType()->isIntegerType()) {
+    // OpenCL V1.2 6.3 says dec/inc ops operate on integer vector types.
   } else {
     S.Diag(OpLoc, diag::err_typecheck_illegal_increment_decrement)
       << ResType << int(IsInc) << Op->getSourceRange();
Index: test/SemaOpenCL/vector_inc_dec_ops.cl
===================================================================
--- test/SemaOpenCL/vector_inc_dec_ops.cl	(revision 0)
+++ test/SemaOpenCL/vector_inc_dec_ops.cl	(revision 0)
@@ -0,0 +1,19 @@
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only
+// expected-no-diagnostics
+
+typedef __attribute__((ext_vector_type(2)))  char char2;
+typedef __attribute__((ext_vector_type(4)))  unsigned int uint4;
+typedef __attribute__((ext_vector_type(8)))  long long8;
+
+void vectorIncrementDecrementOps()
+{
+  char2 A = (char2)(1);
+  uint4 B = (uint4)(1);
+  long8 C = (long8)(1);
+
+  A++;
+  --A;
+  B++;
+  --B;
+  C++;
+}