Add optimization for noexcept methods and test cases

TestComponentCSharp/Class.cpp

@@ -718,7 +718,7 @@ namespace winrt::TestComponentCSharp::implementation
  return winrt::single_threaded_vector_view(std::vector<IProperties1>{ *this, *this, *this });
  }
 
- IVectorView<TestComponentCSharp::Class> Class::GetClassVector()
+ IVectorView<TestComponentCSharp::Class> Class::GetClassVector() noexcept
  {
  return winrt::single_threaded_vector_view(std::vector<TestComponentCSharp::Class>{ *this, *this, *this });
  }
@@ -1031,11 +1031,11 @@ namespace winrt::TestComponentCSharp::implementation
  return _string;
  }
 
- int32_t Class::ReadWriteProperty()
+ int32_t Class::ReadWriteProperty() 
  {
  return _int;
  }
- void Class::ReadWriteProperty(int32_t value)
+ void Class::ReadWriteProperty(int32_t value) noexcept
  {
  _int = value;
  }

TestComponentCSharp/Class.h

@@ -201,7 +201,7 @@ namespace winrt::TestComponentCSharp::implementation
  Windows::Foundation::Collections::IVectorView<TestComponentCSharp::ComposedNonBlittableStruct> GetNonBlittableStructVector();
  Windows::Foundation::Collections::IVectorView<Windows::Foundation::IInspectable> GetObjectVector();
  Windows::Foundation::Collections::IVectorView<TestComponentCSharp::IProperties1> GetInterfaceVector();
- Windows::Foundation::Collections::IVectorView<TestComponentCSharp::Class> GetClassVector();
+ Windows::Foundation::Collections::IVectorView<TestComponentCSharp::Class> GetClassVector() noexcept;
 
  Windows::Foundation::Collections::IIterable<int32_t> GetIntIterable();
  void SetIntIterable(Windows::Foundation::Collections::IIterable<int32_t> const& value);
@@ -316,7 +316,7 @@ namespace winrt::TestComponentCSharp::implementation
  //int32_t DrawTo();
  int32_t ReadWriteProperty();
  //int32_t DistinctProperty();
- void ReadWriteProperty(int32_t value);
+ void ReadWriteProperty(int32_t value) noexcept;
  //hstring DistinctProperty();
  //void DistinctProperty(hstring const& value);
 

TestComponentCSharp/TestComponentCSharp.idl

@@ -83,7 +83,7 @@ namespace TestComponentCSharp
 
  interface IProperties2 requires IProperties1
  {
- Int32 ReadWriteProperty{ set; };
+ [noexcept] Int32 ReadWriteProperty{ set; };
  //String DisjointProperty{ set; };
  //String DistinctProperty{ get; set; };
  }
@@ -224,7 +224,7 @@ namespace TestComponentCSharp
  Windows.Foundation.Collections.IVectorView<ComposedNonBlittableStruct> GetNonBlittableStructVector();
  Windows.Foundation.Collections.IVectorView<Object> GetObjectVector();
  Windows.Foundation.Collections.IVectorView<IProperties1> GetInterfaceVector();
- Windows.Foundation.Collections.IVectorView<Class> GetClassVector();
+ [noexcept] Windows.Foundation.Collections.IVectorView<Class> GetClassVector();
 
  Windows.Foundation.Collections.IIterable<Int32> GetIntIterable();
  void SetIntIterable(Windows.Foundation.Collections.IIterable<Int32> value);

cswinrt/code_writers.h

@@ -9,11 +9,6 @@ namespace cswinrt
 {
  using namespace winmd::reader;
 
- static inline bool starts_with(std::string_view const& value, std::string_view const& match) noexcept
- {
- return 0 == value.compare(0, match.size(), match);
- }
-
  static const struct
  {
  char const* csharp;
@@ -2457,15 +2452,15 @@ event % %;)",
  return marshalers;
  }
 
- void write_abi_method_call_marshalers(writer& w, std::string_view invoke_target, bool is_generic, std::vector<abi_marshaler> const& marshalers)
+ void write_abi_method_call_marshalers(writer& w, std::string_view invoke_target, bool is_generic, std::vector<abi_marshaler> const& marshalers, bool has_noexcept_attr = false)
  {
  auto write_abi_invoke = [&](writer& w)
  {
  if (is_generic)
  {
  w.write("%.DynamicInvokeAbi(__params);\n", invoke_target);
  }
- else
+ else if (!has_noexcept_attr)
  {
  w.write("global::WinRT.ExceptionHelpers.ThrowExceptionForHR(%(ThisPtr%));\n",
  invoke_target,
@@ -2475,6 +2470,15 @@ event % %;)",
  m.write_marshal_to_abi(w);
  }, marshalers));
  }
+ else {
+ w.write("%(ThisPtr%);\n",
+ invoke_target,
+ bind_each([](writer& w, abi_marshaler const& m)
+ {
+ w.write(", ");
+ m.write_marshal_to_abi(w);
+ }, marshalers));
+ }
  for (auto&& m : marshalers)
  {
  m.write_marshal_from_abi(w);
@@ -2529,9 +2533,9 @@ finally
  );
  }
 
- void write_abi_method_call(writer& w, method_signature signature, std::string_view invoke_target, bool is_generic, bool raw_return_type = false)
+ void write_abi_method_call(writer& w, method_signature signature, std::string_view invoke_target, bool is_generic, bool raw_return_type = false, bool has_noexcept_attr = false)
  {
- write_abi_method_call_marshalers(w, invoke_target, is_generic, get_abi_marshalers(w, signature, is_generic, "", raw_return_type));
+ write_abi_method_call_marshalers(w, invoke_target, is_generic, get_abi_marshalers(w, signature, is_generic, "", raw_return_type), has_noexcept_attr);
  }
 
  void write_abi_method_with_raw_return_type(writer& w, MethodDef const& method)
@@ -2574,7 +2578,7 @@ public unsafe %% %(%)
  bind(write_raw_return_type, signature),
  method.Name(),
  bind_list<write_projection_parameter>(", ", signature.params()),
- bind<write_abi_method_call>(signature, invoke_target, is_generic, true));
+ bind<write_abi_method_call>(signature, invoke_target, is_generic, true, is_noexcept(method)));
  }
 
 
@@ -2652,7 +2656,7 @@ public unsafe % %(%)
  bind(write_raw_return_type, signature),
  method.Name(),
  bind(write_composable_constructor_params, signature),
- bind<write_abi_method_call_marshalers>(invoke_target, is_generic, abi_marshalers));
+ bind<write_abi_method_call_marshalers>(invoke_target, is_generic, abi_marshalers, is_noexcept(method)));
  }
 
  template<auto method_writer>
@@ -2768,7 +2772,7 @@ global::System.Collections.Concurrent.ConcurrentDictionary<RuntimeTypeHandle, IO
  method.Name(),
  bind_list<write_projection_parameter>(", ", signature.params()),
  bind(init_call_variables),
- bind<write_abi_method_call>(signature, invoke_target, is_generic, false));
+ bind<write_abi_method_call>(signature, invoke_target, is_generic, false, is_noexcept(method)));
  }
 
  for (auto&& prop : type.PropertyList())
@@ -2788,6 +2792,7 @@ global::System.Collections.Concurrent.ConcurrentDictionary<RuntimeTypeHandle, IO
  }
  }),
  prop.Name());
+
  if (getter)
  {
  auto [invoke_target, is_generic] = get_method_info(getter);
@@ -2797,7 +2802,7 @@ global::System.Collections.Concurrent.ConcurrentDictionary<RuntimeTypeHandle, IO
 {%%}
 )",
  bind(init_call_variables),
- bind<write_abi_method_call_marshalers>(invoke_target, is_generic, marshalers));
+ bind<write_abi_method_call_marshalers>(invoke_target, is_generic, marshalers, is_noexcept(prop)));
  }
  if (setter)
  {
@@ -2815,7 +2820,7 @@ global::System.Collections.Concurrent.ConcurrentDictionary<RuntimeTypeHandle, IO
 {%%}
 )",
  bind(init_call_variables),
- bind<write_abi_method_call_marshalers>(invoke_target, is_generic, marshalers));
+ bind<write_abi_method_call_marshalers>(invoke_target, is_generic, marshalers, is_noexcept(prop)));
  }
  w.write("}\n");
  }
@@ -5193,7 +5198,7 @@ public static Guid PIID = GuidGenerator.CreateIID(typeof(%));)",
  bind<write_abi_parameter_types>(signature));
  }
  }),
- bind<write_abi_method_call>(signature, "abiInvoke", is_generic, false),
+ bind<write_abi_method_call>(signature, "abiInvoke", is_generic, false, is_noexcept(method)),
  // FromManaged
  type_name,
  // DisposeMarshaler

cswinrt/helpers.h

@@ -5,12 +5,32 @@ namespace cswinrt
  using namespace std::literals;
  using namespace winmd::reader;
 
+ static inline bool starts_with(std::string_view const& value, std::string_view const& match) noexcept
+ {
+ return 0 == value.compare(0, match.size(), match);
+ }
+
+ static bool is_remove_overload(MethodDef const& method)
+ {
+ return method.SpecialName() && starts_with(method.Name(), "remove_");
+ }
+
  template <typename T>
  bool has_attribute(T const& row, std::string_view const& type_namespace, std::string_view const& type_name)
  {
  return static_cast<bool>(get_attribute(row, type_namespace, type_name));
  }
 
+ static bool is_noexcept(MethodDef const& method)
+ {
+ return is_remove_overload(method) || has_attribute(method, "Windows.Foundation.Metadata", "NoExceptionAttribute");
+ }
+
+ static bool is_noexcept(Property const& prop)
+ {
+ return has_attribute(prop, "Windows.Foundation.Metadata", "NoExceptionAttribute");
+ }
+
  bool is_exclusive_to(TypeDef const& type)
  {
  return get_category(type) == category::interface_type && has_attribute(type, "Windows.Foundation.Metadata"sv, "ExclusiveToAttribute"sv);