Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions test-app/app/src/main/assets/app/mainpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ require("./tests/testRuntimeImplementedAPIs");
require("./tests/testsInstanceOfOperator");
require("./tests/testProxyReceivers");
require("./tests/testReleaseNativeCounterpart");
require("./tests/testObjectArgumentPath");
require("./tests/testJSONObjects");
require("./tests/kotlin/companions/testCompanionObjectsSupport");
require("./tests/kotlin/properties/testPropertiesSupport");
Expand Down
177 changes: 177 additions & 0 deletions test-app/app/src/main/assets/app/tests/testObjectArgumentPath.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
describe("Object arguments and cached call signatures", function () {
function roundTrip(obj) {
return java.util.Collections.singletonList(obj).get(0);
}

it("passes a Java wrapper as an object argument on every call", function () {
var list = new java.util.ArrayList();
for (var i = 0; i < 3; i++) {
expect(roundTrip(list)).toBe(list);
}
});

it("passes an extended class instance as an object argument", function () {
var Extended = java.lang.Object.extend({
toString: function () {
return "extended arg";
}
});
var instance = new Extended();
for (var i = 0; i < 3; i++) {
expect(roundTrip(instance)).toBe(instance);
expect(new java.lang.StringBuilder().append(instance).toString()).toBe("extended arg");
}
});

it("passes a TypeScript subclass instance as an object argument", function () {
var TsButton = (function (_super) {
__extends(TsButton, _super);
function TsButton() {
var _this = _super.call(this) || this;
_this.label = "ts arg";
return _this;
}
TsButton.prototype.toString = function () {
return this.label;
};
return TsButton;
})(com.tns.tests.Button1);

var button = new TsButton();
for (var i = 0; i < 3; i++) {
expect(roundTrip(button)).toBe(button);
expect(new java.lang.StringBuilder().append(button).toString()).toBe("ts arg");
}
});

it("rejects a released wrapper as an object argument", function () {
var released = new java.lang.Object();
global.__releaseNativeCounterpart(released);
expect(function () {
roundTrip(released);
}).toThrow();
});

it("resolves numeric casts, typed nulls and wrappers on a warm overload cache", function () {
var list = new java.util.ArrayList();
var sb = new java.lang.StringBuilder();
for (var i = 0; i < 3; i++) {
sb.append(long(5));
sb.append(char("x"));
sb.append(double(1));
sb.append(float(2));
sb.append(java.lang.String.null);
sb.append(java.lang.Object.null);
sb.append(list);
sb.append("|");
}
var round = "5x1.02.0nullnull[]|";
expect(sb.toString()).toBe(round + round + round);
});

it("passes a numeric cast to a method with a single signature", function () {
for (var i = 0; i < 3; i++) {
expect(java.lang.Long.toHexString(long("4294967296"))).toBe("100000000");
}
});

it("constructs through each overload on a warm constructor cache", function () {
for (var i = 0; i < 3; i++) {
expect(new java.lang.StringBuilder("ab").toString()).toBe("ab");
expect(new java.lang.StringBuilder(32).capacity()).toBe(32);
expect(new java.lang.StringBuilder(new java.lang.StringBuilder("cs")).toString()).toBe("cs");
var plain = new java.lang.Object();
expect(plain.getClass().getName()).toBe("java.lang.Object");
}
});

it("constructs extended classes repeatedly, interleaved and with arguments", function () {
var Counting = java.util.ArrayList.extend({
size: function () {
return this.super.size() + 100;
}
});
var Named = java.lang.Object.extend({
toString: function () {
return "named";
}
});
var source = new java.util.ArrayList();
source.add("a");

var seen = [];
for (var i = 0; i < 20; i++) {
var empty = new Counting();
empty.add("x");
expect(empty.size()).toBe(101);
expect(new Counting(10).size()).toBe(100);
expect(new Counting(source).size()).toBe(101);
var named = new Named();
expect(named.toString()).toBe("named");
expect(seen.indexOf(empty)).toBe(-1);
seen.push(empty);
}
});

describe("cached Java objects of linked wrappers", function () {
var Holder = com.tns.tests.WrapperHolder;

function collectJava() {
for (var i = 0; i < 3; i++) {
java.lang.Runtime.getRuntime().gc();
java.lang.System.runFinalization();
}
}

afterEach(function () {
Holder.held = null;
});

it("never pass null for a wrapper whose Java object was collected after Java weakened it", function () {
(function () {
Holder.held = new java.lang.StringBuilder("weakened");
})();
gc();
// Any Java call flushes the collected wrapper, weakening its Java object.
collectJava();
var again = Holder.held;
Holder.held = null;
collectJava();

var passed;
try {
passed = java.util.Collections.singletonList(again).get(0);
} catch (e) {
passed = "threw";
}
expect(passed === again || passed === "threw").toBe(true);
});

it("resolve a reachable wrapper after warm instance calls and a collection", function () {
var sb = new java.lang.StringBuilder("warm");
for (var i = 0; i < 50; i++) {
expect(sb.length()).toBe(4);
}
for (var j = 0; j < 2000; j++) {
new java.lang.Object();
}
gc();
collectJava();
expect(sb.toString()).toBe("warm");
expect(java.util.Collections.singletonList(sb).get(0)).toBe(sb);
});

it("resolve a constructed instance after Java made another of its class during the constructor", function () {
var Outer = com.tns.tests.SelfNesting.extend({
touch: function () {
this.super.touch();
},
selfNestingSpec: true
});
var outer = new Outer(true);
expect(outer.getTag()).toBe(2);
collectJava();
expect(outer.getTag()).toBe(2);
});
});
});
25 changes: 25 additions & 0 deletions test-app/app/src/main/java/com/tns/tests/SelfNesting.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.tns.tests;

/** Creates an instance of its own runtime class while its constructor runs. */
public class SelfNesting {
private final int tag;

public SelfNesting() {
tag = 1;
}

public SelfNesting(boolean nest) throws Exception {
tag = 2;
if (nest) {
SelfNesting nested = getClass().getConstructor().newInstance();
nested.touch();
}
}

public int getTag() {
return tag;
}

public void touch() {
}
}
25 changes: 18 additions & 7 deletions test-app/runtime/src/main/cpp/CallbackHandlers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@ bool CallbackHandlers::RegisterInstance(Isolate *isolate, const Local<Object> &j
bool isInterface,
const std::string &baseClassName,
uint64_t defaultOverrides,
const vector<string> *contentMemberNames) {
const vector<string> *contentMemberNames,
jclass *resolvedClass) {
bool success;

DEBUG_WRITE("RegisterInstance called for '%s'", fullClassName.c_str());
Expand All @@ -230,9 +231,15 @@ bool CallbackHandlers::RegisterInstance(Isolate *isolate, const Local<Object> &j

// The default-overriding class does not depend on the implementation object, whose
// properties ResolveClass would otherwise read, getters included.
jclass generatedJavaClass = ResolveClass(isolate, baseClassName, fullClassName,
defaultOverrides != 0 ? Local<Object>() : implementationObject,
isInterface, contentMemberNames);
jclass generatedJavaClass = resolvedClass != nullptr ? *resolvedClass : nullptr;
if (generatedJavaClass == nullptr) {
generatedJavaClass = ResolveClass(isolate, baseClassName, fullClassName,
defaultOverrides != 0 ? Local<Object>() : implementationObject,
isInterface, contentMemberNames);
if (resolvedClass != nullptr) {
*resolvedClass = generatedJavaClass;
}
}

int javaObjectID = objectManager->GenerateNewObjectID();

Expand All @@ -253,7 +260,7 @@ bool CallbackHandlers::RegisterInstance(Isolate *isolate, const Local<Object> &j
instance = env.NewObject(generatedJavaClass, mi.mid);
} else {
// resolve arguments before passing them on to the constructor
JsArgConverter argConverter(argWrapper.args, mi.signature);
JsArgConverter argConverter(argWrapper.args, mi.parsedSig);
auto ctorArgs = argConverter.ToArgs();

instance = env.NewObjectA(generatedJavaClass, mi.mid, ctorArgs);
Expand All @@ -268,6 +275,9 @@ bool CallbackHandlers::RegisterInstance(Isolate *isolate, const Local<Object> &j

jlong usedJavaMemory = env.CallLongMethod(runtime->GetJavaRuntime(), REGISTER_CONSTRUCTED_INSTANCE_ID,
instance, javaObjectID);
// While the constructor ran, an instance of the same class that Java created could take
// this id until the registration above replaced it; a jweak cached then names that one.
objectManager->ForgetCachedJavaObject(javaObjectID);

AdjustAmountOfExternalAllocatedMemory(isolate, usedJavaMemory);

Expand Down Expand Up @@ -505,9 +515,10 @@ void CallbackHandlers::CallJavaMethod(const Local<Object> &caller, const string
methodName.c_str());
}

const std::vector<std::string> *parsedSig = mi != nullptr ? &mi->parsedSig : nullptr;
JsArgConverter argConverter = (entry != nullptr && entry->isExtensionFunction)
? JsArgConverter(caller, args, *sig, entry)
: JsArgConverter(args, false, *sig, entry);
? JsArgConverter(caller, args, *sig, entry, parsedSig)
: JsArgConverter(args, false, *sig, entry, parsedSig);


if (!argConverter.IsValid()) {
Expand Down
3 changes: 2 additions & 1 deletion test-app/runtime/src/main/cpp/CallbackHandlers.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ namespace tns {
bool isInterface,
const std::string &baseClassName = std::string(),
uint64_t defaultOverrides = 0,
const std::vector<std::string> *contentMemberNames = nullptr);
const std::vector<std::string> *contentMemberNames = nullptr,
jclass *resolvedClass = nullptr);

// Whether GetImplementedInterfaces would list any interface, without calling Java.
static bool HasImplementedInterfaces(v8::Isolate *isolate, const v8::Local<v8::Object> &implementationObject);
Expand Down
64 changes: 32 additions & 32 deletions test-app/runtime/src/main/cpp/JsArgConverter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,25 +89,33 @@ namespace {
}
}

void JsArgConverter::SetTokens(const string &methodSignature, MetadataEntry *entry,
const std::vector<std::string> *parsedSignature) {
if (parsedSignature != nullptr) {
m_tokens = parsedSignature;
} else if ((entry != nullptr) && (entry->getIsResolved())) {
if (entry->parsedSig.empty()) {
JniSignatureParser parser(methodSignature);
entry->parsedSig = parser.Parse();
}
m_tokens = &entry->parsedSig;
} else {
JniSignatureParser parser(methodSignature);
m_ownedTokens = parser.Parse();
}
}

JsArgConverter::JsArgConverter(const Local<Object> &caller,
const v8::FunctionCallbackInfo<Value> &args,
const string &methodSignature, MetadataEntry *entry)
const string &methodSignature, MetadataEntry *entry,
const std::vector<std::string> *parsedSignature)
: m_isolate(args.GetIsolate()), m_isValid(true),
m_error(Error()) {
int v8ProvidedArgumentsLength = args.Length();
m_argsLen = 1 + v8ProvidedArgumentsLength;

if (m_argsLen > 0) {
if ((entry != nullptr) && (entry->getIsResolved())) {
if (entry->parsedSig.empty()) {
JniSignatureParser parser(methodSignature);
entry->parsedSig = parser.Parse();
}
m_tokens = &entry->parsedSig;
} else {
JniSignatureParser parser(methodSignature);
m_ownedTokens = parser.Parse();
}
SetTokens(methodSignature, entry, parsedSignature);

m_isValid = ConvertArg(caller, 0);

Expand All @@ -127,22 +135,14 @@ JsArgConverter::JsArgConverter(const Local<Object> &caller,

JsArgConverter::JsArgConverter(const v8::FunctionCallbackInfo<Value> &args,
bool hasImplementationObject, const string &methodSignature,
MetadataEntry *entry)
MetadataEntry *entry,
const std::vector<std::string> *parsedSignature)
: m_isolate(args.GetIsolate()), m_isValid(true),
m_error(Error()) {
m_argsLen = !hasImplementationObject ? args.Length() : args.Length() - 1;

if (m_argsLen > 0) {
if ((entry != nullptr) && (entry->getIsResolved())) {
if (entry->parsedSig.empty()) {
JniSignatureParser parser(methodSignature);
entry->parsedSig = parser.Parse();
}
m_tokens = &entry->parsedSig;
} else {
JniSignatureParser parser(methodSignature);
m_ownedTokens = parser.Parse();
}
SetTokens(methodSignature, entry, parsedSignature);

for (int i = 0; i < m_argsLen; i++) {
m_isValid = ConvertArg(args[i], i);
Expand All @@ -155,16 +155,11 @@ JsArgConverter::JsArgConverter(const v8::FunctionCallbackInfo<Value> &args,
}

JsArgConverter::JsArgConverter(const v8::FunctionCallbackInfo<Value> &args,
const string &methodSignature)
const std::vector<std::string> &parsedSignature)
: m_isolate(args.GetIsolate()), m_isValid(true),
m_error(Error()) {
m_tokens(&parsedSignature), m_error(Error()) {
m_argsLen = args.Length();

if (m_argsLen > 0) {
JniSignatureParser parser(methodSignature);
m_ownedTokens = parser.Parse();
}

for (int i = 0; i < m_argsLen; i++) {
m_isValid = ConvertArg(args[i], i);

Expand Down Expand Up @@ -321,7 +316,10 @@ bool JsArgConverter::ConvertArg(const Local<Value> &jsArg, int index) {
auto context = m_isolate->GetCurrentContext();
auto jsObject = arg->ToObject(context).ToLocalChecked();

auto castType = NumericCasts::GetCastType(m_isolate, jsObject);
// Cast markers and the null sentinel are only put on plain objects, never on a
// Java wrapper (an object with the runtime's internal fields).
bool isWrapper = ObjectManager::HasMetadataField(jsObject);
auto castType = isWrapper ? CastType::None : NumericCasts::GetCastType(m_isolate, jsObject);

Local<Value> castValue;
JniLocalRef obj;
Expand Down Expand Up @@ -419,8 +417,10 @@ bool JsArgConverter::ConvertArg(const Local<Value> &jsArg, int index) {
? GetOrLinkJavaBuffer(m_objectManager, jsObject)
: m_objectManager->GetJavaObjectByJsObject(jsObject);

V8GetPrivateValue(m_isolate, jsObject, V8StringConstants::GetNullNodePrivate(m_isolate),
castValue);
if (!isWrapper) {
V8GetPrivateValue(m_isolate, jsObject, V8StringConstants::GetNullNodePrivate(m_isolate),
castValue);
}

if (!castValue.IsEmpty()) {
SetConvertedObject(index, nullptr);
Expand Down
Loading