Restore main to Release-1.2.1-beta.

It's completely unclear to me why I was suddenly allowed to push main. I shouldn't have been able to do that.

For now, just merging back to the state Release was in previously.

Author: jwhpryor

.gitignore

@@ -1,9 +1,5 @@
 bazel*
-.vscode/
-.clwb/
-.ijwb/
-.idea/
-.vscode/
+.vscode
 MODULE.bazel.lock
 cmake_build
-cmake_install
+cmake_install

implementation/local_string.h

@@ -48,11 +48,6 @@ class LocalString : public LocalStringImpl {
   using Base = LocalStringImpl;
   using Base::Base;
 
-  ~LocalString()
-  {
-      printf("~LocalString\n");
-  }
-
   LocalString(LocalObject<kJavaLangString>&& obj)
       : Base(AdoptLocal{}, static_cast<jstring>(obj.Release())) {}
 

implementation/overload_ref.h

@@ -93,7 +93,7 @@ struct OverloadRef {
   }
 
   template <typename... Params>
-  static auto Invoke(jclass clazz, jobject object,
+  static ReturnProxied Invoke(jclass clazz, jobject object,
                               Params&&... params) {
     constexpr std::size_t kRank = ReturnIdT::kRank;
     constexpr bool kStatic = ReturnIdT::kIsStatic;
@@ -104,20 +104,11 @@ struct OverloadRef {
           object, clazz, mthd,
           Proxy_t<Params>::ProxyAsArg(std::forward<Params>(params))...);
     } else if constexpr (IdT::kIsConstructor) {
-      if constexpr (std::is_same_v<typename IdT::_JniT::SpanType, jstring> && IdT::kRank == 0)
-      {
-        return LocalString{
-          AdoptLocal{},
-              Proxy_t<Params>::ProxyAsArg(std::forward<Params>(params))...
-        };
-      } else
-      {
-        return ReturnProxied{
+      return ReturnProxied{
           AdoptLocal{},
           LifecycleHelper<jobject, LifecycleType::LOCAL>::Construct(
               clazz, mthd,
               Proxy_t<Params>::ProxyAsArg(std::forward<Params>(params))...)};
-      }
     } else {
       if constexpr (std::is_base_of_v<RefBaseBase, ReturnProxied>) {
         return ReturnProxied{

implementation/string_ref_test.cc

@@ -49,7 +49,6 @@ static constexpr jni::Class kClass{
     jni::Method{"TakesStrParam", jni::Return<void>{}, jni::Params<jstring>{}},
 };
 
-  /*
 ////////////////////////////////////////////////////////////////////////////////
 // Local String Tests.
 ////////////////////////////////////////////////////////////////////////////////
@@ -235,51 +234,5 @@ TEST_F(JniTest, GlobalString_AllowsRValueGlobalString) {
   LocalObject<kClass> obj{};
   obj.Call<"TakesStrParam">(GlobalString{"abcde"});
 }
-*/
-
-TEST_F(JniTest, AllocationThrash)
-{
-  int i = 0;
-  //while (true)
-  for (int i = 0; i < 1; i++)
-  {
-    //for (int j = 0; j < 10000; j++)
-    for (int j = 0; j < 1; j++)
-    {
-      /*
-      LocalString str = "akdfajslkfaskflj"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs"
-      "alkdsjklafjkldsajklfasdjldasfjklasdfkjdlasfkjdsafljafs";
-      */
-      LocalString str { "akdfajslkfaskflj" };
-    }
-
-    i++;
-    if (i % 100 == 0)
-    {
-      std::cout << "Iteration: " << i << std::endl;
-      // I even tried to manually call gc, but it has no effect in this case.
-    }
-  }
-}
 
 }  // namespace

javatests/com/jnibind/test/StringTest.java

@@ -146,11 +146,4 @@ public void nullStringTests() {
   public void globalReturnsCorrectlyOverJniBoundary() {
     jniReturnsAGlobalString();
   }
-
-  native void nativeAllocationThrash();
-
-  @Test
-  public void allocationThrash() {
-    nativeAllocationThrash();
-  }
 }