Closed Bug 1629860 Opened 2 years ago Closed 2 years ago

Remove superfluous argument aRequestingLocation from nsMixedContentBlocker::ShouldLoad

Categories

(Core :: DOM: Security, task, P1)

task

Tracking

()

RESOLVED INVALID

People

(Reporter: ckerschb, Assigned: ckerschb)

References

Details

(Whiteboard: [domsecurity-active])

Attachments

(1 obsolete file)

No description provided.
Summary: Remove argument aRequestingLocation from nsMixedContentBlocker::ShouldLoad → Remove superfluous argument aRequestingLocation from nsMixedContentBlocker::ShouldLoad
Pushed by rgurzau@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/59e37bc27b66
Remove superfluous argument aRequestingLocation from nsMixedContentBlocker::ShouldLoad. r=baku

Backed out changeset 59e37bc27b66 (bug 1629860) for bustages complaining about nsMixedContentBlocker.cpp

Push with failures: https://treeherder.mozilla.org/#/jobs?repo=autoland&fromchange=5e94064c111db6aedbbe0fd9ca18fd9bbbd166fe&tochange=59a57c023edc1a8ac221aa815310f4a0064b3bbb&searchStr=build&selectedJob=297548677

Backout link: https://hg.mozilla.org/integration/autoland/rev/59a57c023edc1a8ac221aa815310f4a0064b3bbb

Failure log: https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=297548677&repo=autoland&lineNumber=36792

[task 2020-04-14T14:32:08.455Z] 14:32:08     INFO -  In file included from Unified_cpp_dom_security1.cpp:2:
[task 2020-04-14T14:32:08.455Z] 14:32:08     INFO -  /builds/worker/checkouts/gecko/dom/security/nsMixedContentBlocker.cpp(327,3): error: Unused "kungFuDeathGrip" 'nsCOMPtr<nsIPrincipal>' objects constructed from temporary values are prohibited
[task 2020-04-14T14:32:08.456Z] 14:32:08     INFO -    nsCOMPtr<nsIPrincipal> loadingPrincipal = aLoadInfo->GetLoadingPrincipal();
[task 2020-04-14T14:32:08.456Z] 14:32:08     INFO -    ^
[task 2020-04-14T14:32:08.456Z] 14:32:08     INFO -  /builds/worker/checkouts/gecko/dom/security/nsMixedContentBlocker.cpp(327,45): note: Please switch all accesses to this value to go through 'loadingPrincipal', or explicitly pass 'loadingPrincipal' to `mozilla::Unused`
[task 2020-04-14T14:32:08.456Z] 14:32:08     INFO -    nsCOMPtr<nsIPrincipal> loadingPrincipal = aLoadInfo->GetLoadingPrincipal();
[task 2020-04-14T14:32:08.456Z] 14:32:08     INFO -                                              ^
[task 2020-04-14T14:32:08.456Z] 14:32:08     INFO -  1 error generated.
[task 2020-04-14T14:32:08.456Z] 14:32:08     INFO -  /builds/worker/checkouts/gecko/config/rules.mk:750: recipe for target 'Unified_cpp_dom_security1.obj' failed
[task 2020-04-14T14:32:08.456Z] 14:32:08    ERROR -  make[4]: *** [Unified_cpp_dom_security1.obj] Error 1
[task 2020-04-14T14:32:08.456Z] 14:32:08     INFO -  make[4]: Leaving directory '/builds/worker/workspace/obj-build/dom/security'
[task 2020-04-14T14:32:08.456Z] 14:32:08     INFO -  make[4]: *** Waiting for unfinished jobs....

https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=297548667&repo=autoland&lineNumber=36874

[task 2020-04-14T14:32:44.615Z] 14:32:44     INFO -  make[4]: Entering directory '/builds/worker/workspace/obj-build/dom/security'
[task 2020-04-14T14:32:44.615Z] 14:32:44     INFO -  /builds/worker/fetches/sccache/sccache /builds/worker/fetches/clang/bin/clang++ -std=gnu++17 -o Unified_cpp_dom_security1.o -c  -I/builds/worker/workspace/obj-build/dist/stl_wrappers -I/builds/worker/workspace/obj-build/dist/system_wrappers -include /builds/worker/checkouts/gecko/config/gcc_hidden.h -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -DNDEBUG=1 -DTRIMMED=1 -DOS_POSIX=1 -DOS_LINUX=1 -DMOZ_HAS_MOZGLUE -DMOZILLA_INTERNAL_API -DIMPL_LIBXUL -DSTATIC_EXPORTABLE_JS_API -I/builds/worker/checkouts/gecko/dom/security -I/builds/worker/workspace/obj-build/dom/security -I/builds/worker/workspace/obj-build/ipc/ipdl/_ipdlheaders -I/builds/worker/checkouts/gecko/ipc/chromium/src -I/builds/worker/checkouts/gecko/ipc/glue -I/builds/worker/checkouts/gecko/caps -I/builds/worker/checkouts/gecko/docshell/base -I/builds/worker/checkouts/gecko/netwerk/base -I/builds/worker/checkouts/gecko/netwerk/protocol/data -I/builds/worker/checkouts/gecko/netwerk/protocol/http -I/builds/worker/workspace/obj-build/dist/include -I/builds/worker/workspace/obj-build/dist/include/nspr -I/builds/worker/workspace/obj-build/dist/include/nss -fPIC -DMOZILLA_CLIENT -include /builds/worker/workspace/obj-build/mozilla-config.h -Qunused-arguments -Qunused-arguments -Wall -Wbitfield-enum-conversion -Wempty-body -Wignored-qualifiers -Woverloaded-virtual -Wpointer-arith -Wshadow-field-in-constructor-modified -Wsign-compare -Wtype-limits -Wunreachable-code -Wunreachable-code-return -Wwrite-strings -Wno-invalid-offsetof -Wclass-varargs -Wempty-init-stmt -Wfloat-overflow-conversion -Wfloat-zero-conversion -Wloop-analysis -Wc++2a-compat -Wcomma -Wimplicit-fallthrough -Wunused-function -Wunused-variable -Wstring-conversion -Wtautological-overlap-compare -Wtautological-unsigned-enum-zero-compare -Wtautological-unsigned-zero-compare -Wno-error=tautological-type-limit-compare -Wno-inline-new-delete -Wno-error=deprecated-declarations -Wno-error=array-bounds -Wno-error=backend-plugin -Wno-error=return-std-move -Wno-error=atomic-alignment -Wformat -Wformat-security -Wno-gnu-zero-variadic-macro-arguments -Wno-unknown-warning-option -D_GLIBCXX_USE_CXX11_ABI=0 -fno-sized-deallocation -fno-aligned-new -fsanitize=thread -fcrash-diagnostics-dir=/builds/worker/artifacts -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -fno-math-errno -pthread -pipe -g -Xclang -load -Xclang /builds/worker/workspace/obj-build/build/clang-plugin/libclang-plugin.so -Xclang -add-plugin -Xclang moz-check -O2 -gline-tables-only -fomit-frame-pointer -funwind-tables -fexperimental-new-pass-manager  -MD -MP -MF .deps/Unified_cpp_dom_security1.o.pp   Unified_cpp_dom_security1.cpp
[task 2020-04-14T14:32:44.615Z] 14:32:44     INFO -  In file included from Unified_cpp_dom_security1.cpp:2:
[task 2020-04-14T14:32:44.615Z] 14:32:44    ERROR -  /builds/worker/checkouts/gecko/dom/security/nsMixedContentBlocker.cpp:327:3: error: Unused "kungFuDeathGrip" 'nsCOMPtr<nsIPrincipal>' objects constructed from temporary values are prohibited
[task 2020-04-14T14:32:44.616Z] 14:32:44     INFO -    nsCOMPtr<nsIPrincipal> loadingPrincipal = aLoadInfo->GetLoadingPrincipal();
[task 2020-04-14T14:32:44.616Z] 14:32:44     INFO -    ^
[task 2020-04-14T14:32:44.616Z] 14:32:44     INFO -  /builds/worker/checkouts/gecko/dom/security/nsMixedContentBlocker.cpp:327:45: note: Please switch all accesses to this value to go through 'loadingPrincipal', or explicitly pass 'loadingPrincipal' to `mozilla::Unused`
[task 2020-04-14T14:32:44.616Z] 14:32:44     INFO -    nsCOMPtr<nsIPrincipal> loadingPrincipal = aLoadInfo->GetLoadingPrincipal();
[task 2020-04-14T14:32:44.616Z] 14:32:44     INFO -                                              ^
[task 2020-04-14T14:32:44.616Z] 14:32:44     INFO -  1 error generated.
[task 2020-04-14T14:32:44.616Z] 14:32:44     INFO -  /builds/worker/checkouts/gecko/config/rules.mk:750: recipe for target 'Unified_cpp_dom_security1.o' failed
[task 2020-04-14T14:32:44.616Z] 14:32:44    ERROR -  make[4]: *** [Unified_cpp_dom_security1.o] Error 1
[task 2020-04-14T14:32:44.616Z] 14:32:44     INFO -  make[4]: Leaving directory '/builds/worker/workspace/obj-build/dom/security'
[task 2020-04-14T14:32:44.616Z] 14:32:44     INFO -  make[4]: *** Waiting for unfinished jobs....
Flags: needinfo?(ckerschb)

(In reply to Bogdan Tara[:bogdan_tara | bogdant] from comment #3)

[task 2020-04-14T14:32:44.615Z] 14:32:44 ERROR - /builds/worker/checkouts/gecko/dom/security/nsMixedContentBlocker.cpp:327:3: error: Unused "kungFuDeathGrip" 'nsCOMPtr<nsIPrincipal>' objects constructed from temporary values are prohibited
[task 2020-04-14T14:32:44.616Z] 14:32:44 INFO - nsCOMPtr<nsIPrincipal> loadingPrincipal = aLoadInfo->GetLoadingPrincipal();
[task 2020-04-14T14:32:44.616Z] 14:32:44 INFO - ^

hm interestingly this build just fine locally, but agreed, no need for that tmp variable - will remove it.

Flags: needinfo?(ckerschb)
Pushed by btara@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/b4fe683e333a
Remove superfluous argument aRequestingLocation from nsMixedContentBlocker::ShouldLoad. r=baku
Backout by malexandru@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/046dfbddf738
Backed out changeset b4fe683e333a for causing multiple failures.

I'll have a look - sorry and thanks!

Flags: needinfo?(ckerschb)

So, I think the patch within Bug 1629876 is the better approach, which also renders this bug invalid.

Status: ASSIGNED → RESOLVED
Closed: 2 years ago
Resolution: --- → INVALID
Attachment #9140420 - Attachment is obsolete: true
You need to log in before you can comment on or make changes to this bug.