Merge from 'sycl' to 'sycl-web'

Author: iclsrc

clang/lib/Driver/Driver.cpp

@@ -5940,8 +5940,6 @@ class OffloadingActionBuilder final {
       return NumOfDeviceLibLinked != 0;
     }
 
-    Action *appendLinkHostActions(ActionList &AL) override { return AL.back(); }
-
     void appendLinkDependences(OffloadAction::DeviceDependences &DA) override {
       // DeviceLinkerInputs holds binaries per ToolChain (TC) / bound-arch pair
       // The following will loop link and post process for each TC / bound-arch

sycl/doc/extensions/experimental/sycl_ext_oneapi_annotated_ptr.asciidoc

@@ -528,10 +528,10 @@ class annotated_ref {
     T operator=(const annotated_ref&) const;
     // OP is: +=, -=, *=, /=, %=, <<=, >>=, &=, |=, ^=
     T operatorOP(const T &) const;
-    T operator++();
-    T operator++(int);
-    T operator--();
-    T operator--(int);
+    T operator++() const;
+    T operator++(int) const;
+    T operator--() const;
+    T operator--(int) const;
   };
 } // namespace sycl::ext::oneapi::experimental
 ```
@@ -556,7 +556,7 @@ annotations when the object is loaded from memory.
 a|
 [source,c++]
 ----
-T operator=(const T &);
+T operator=(const T &) const;
 ----
 |
 Writes an object of type `T` to the location referenced by this wrapper,
@@ -566,14 +566,14 @@ applying the annotations when the object is stored to memory.
 a|
 [source,c++]
 ----
-T operator=(const annotated_ref& other);
+T operator=(const annotated_ref& other) const;
 ----
 a|
 Equivalent to:
 ```c++
-tmp T = other;   // Reads from memory
+T tmp = other;   // Reads from memory
                  // with annotations
-*this = T;       // Writes to memory
+*this = tmp;     // Writes to memory
                  // with annotations
 return T;
 ```
@@ -583,18 +583,18 @@ Does not rebind the reference!
 a|
 [source,c++]
 ----
-T operatorOP(const T &);
+T operatorOP(const T &) const;
 ----
 a|
 Where [code]#OP# is: [code]#pass:[+=]#, [code]#-=#,[code]#*=#, [code]#/=#, [code]#%=#, [code]#+<<=+#, [code]#>>=#, [code]#&=#, [code]#\|=#, [code]#^=#.
 
 Compound assignment operators. Return result by value.
-Available only if the corresponding non-compound operator is available for `T`.
+Available only if the corresponding assignment operator OP is available for `T`.
 Equivalent to:
 ```c++
 T tmp = *this;     // Reads from memory
                    // with annotations
-tmp = tmp OP val;
+tmp OP val;
 *this = tmp;       // Writes to memory
                    // with annotations
 return tmp;
@@ -603,14 +603,16 @@ return tmp;
 a|
 [source,c++]
 ----
-T operator++();
-T operator++(int);
-T operator--();
-T operator--(int);
+T operator++() const;
+T operator++(int) const;
+T operator--() const;
+T operator--(int) const;
 ----
 |
-increment and decrement operator of annotated_ref. The annotations are applied
-when the object `T` is loaded and stored to the memory.
+Increment and decrement operator of annotated_ref. Increment/Decrement the object `T`
+referenced by this wrapper via ``T``'s Increment/Decrement operator.
+
+The annotations are applied when the object `T` is loaded and stored to the memory.
 |===
 
 == Issues related to `annotated_ptr`

sycl/include/sycl/ext/oneapi/experimental/annotated_ptr/annotated_ptr.hpp

@@ -32,7 +32,12 @@ namespace experimental {
 
 namespace {
 #define PROPAGATE_OP(op)                                                       \
-  T operator op##=(const T &rhs) const { return *this = *this op rhs; }
+  T operator op##=(const T &rhs) const {                                       \
+    T t = *this;                                                               \
+    t op## = rhs;                                                              \
+    *this = t;                                                                 \
+    return t;                                                                  \
+  }
 
 // compare strings on compile time
 constexpr bool compareStrs(const char *Str1, const char *Str2) {
@@ -114,22 +119,36 @@ class annotated_ref<T, detail::properties_t<Props...>> {
   PROPAGATE_OP(<<)
   PROPAGATE_OP(>>)
 
-  T operator++() { return *this += 1; }
-
-  T operator++(int) {
-    const T t = *this;
-    *this = (t + 1);
+  T operator++() const {
+    T t = *this;
+    ++t;
+    *this = t;
     return t;
   }
 
-  T operator--() { return *this -= 1; }
+  T operator++(int) const {
+    T t1 = *this;
+    T t2 = t1;
+    t2++;
+    *this = t2;
+    return t1;
+  }
 
-  T operator--(int) {
-    const T t = *this;
-    *this = (t - 1);
+  T operator--() const {
+    T t = *this;
+    --t;
+    *this = t;
     return t;
   }
 
+  T operator--(int) const {
+    T t1 = *this;
+    T t2 = t1;
+    t2--;
+    *this = t2;
+    return t1;
+  }
+
   template <class T2, class P2> friend class annotated_ptr;
 };
 

sycl/include/sycl/ext/oneapi/properties/property.hpp

@@ -221,8 +221,11 @@ enum PropKind : uint32_t {
   BuildOptions = 51,
   BuildLog = 52,
   FloatingPointControls = 53,
+  // Reserved for internal use to avoid merge conflicts. Update when possible.
+  InternalProperty1 = 54,
+  InternalProperty2 = 55,
   // PropKindSize must always be the last value.
-  PropKindSize = 54,
+  PropKindSize = 56,
 };
 
 // This trait must be specialized for all properties and must have a unique