1153159 - [bluetooth2] Passing "promise" in the parameter list of |BT_ENSURE_TRUE_RESOLVE| and |BT_ENSURE_TRUE_REJECT|

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Bluetooth, defect)

Description

[Bruce Sun [:brsun]]

|BT_ENSURE_TRUE_RESOLVE|[1] and |BT_ENSURE_TRUE_REJECT|[2] assume there is always has a variable named as "promise" on the stack. Passing the promise variable through the parameter list would be better than hard-coding the variable name within the macro.

[1] https://dxr.mozilla.org/mozilla-central/source/dom/bluetooth2/BluetoothCommon.h#122
[2] https://dxr.mozilla.org/mozilla-central/source/dom/bluetooth2/BluetoothCommon.h#134

Comment 1

[Bruce Sun [:brsun]]

Attachment: bug1153159_bluetooth2_pass_promise_in_macro.patch

Comment 2

[Ben Tian (inactive)]

Comment on attachment 8595728 [details] [diff] [review]
bug1153159_bluetooth2_pass_promise_in_macro.patch

Review of attachment 8595728 [details] [diff] [review]:
-----------------------------------------------------------------

r=me with comment addressed. Thanks!

::: dom/bluetooth/BluetoothCommon.h
@@ +130,5 @@
>    do {                                                               \
>      if (MOZ_UNLIKELY(!(x))) {                                        \
>        BT_API2_LOGR("BT_ENSURE_TRUE_RESOLVE(" #x ") failed");         \
>        promise->MaybeResolve(ret);                                    \
>        return promise.forget();                                       \

Add parentheses for |promise|.

@@ +142,5 @@
>    do {                                                               \
>      if (MOZ_UNLIKELY(!(x))) {                                        \
>        BT_API2_LOGR("BT_ENSURE_TRUE_REJECT(" #x ") failed");          \
>        promise->MaybeReject(ret);                                     \
>        return promise.forget();                                       \

Ditto.

Comment 3

[Bruce Sun [:brsun]]

Attachment: bug1153159_bluetooth2_pass_promise_in_macro.commit.patch

Comment 4

[Bruce Sun [:brsun]]

Try results seem good:
 - https://treeherder.mozilla.org/#/jobs?repo=try&revision=9feacb9b8074

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/b2g-inbound/rev/2537f573b7ab

Comment 6

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/2537f573b7ab